Merge pull request #269 from shivammathur/develop

Hotfix

.eslintrc.json

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

.github/CONTRIBUTING.md

@@ -8,7 +8,7 @@ Please note that this project is released with a [Contributor Code of Conduct](C
 
 * Fork the project.
 * Make your bug fix or feature addition.
-* Add tests for it, so we don't break it in a future version unintentionally.
+* Add tests for it. This is important so we don't break it in a future version unintentionally.
 * If editing the scripts, create a demo integration test.
 * Send a pull request to the develop branch with all the details.
 
@@ -18,6 +18,13 @@ Due to time constraints, you may not always get a quick response. Please do not
 
 ## Coding Guidelines
 
+This project comes with `.prettierrc.json` and `eslintrc.json` configuration files. Please run the following commands to format the code before committing it.
+
+```bash
+$ npm run format
+$ npm run lint
+```
+
 ## Using setup-php from a Git checkout
 
 The following commands can be used to perform the initial checkout of setup-php:
@@ -34,19 +41,6 @@ Install setup-php dependencies using [npm](https://www.npmjs.com/):
 $ npm install
 ```
 
-If you are using `Windows` configure `git` to handle line endings.
-
-```cmd
-git config --local core.autocrlf true
-```
-
-This project comes with `.prettierrc.json` and `eslintrc.json` configuration files. Please run the following commands to fix and verify the code quality.
-
-```bash
-$ npm run format
-$ npm run lint
-```
-
 ## Running the test suite
 
 After following the steps shown above, The `setup-php` tests in the `__tests__` directory can be run using this command:

.github/FUNDING.yml

@@ -1,6 +1,5 @@
 # These are supported funding model platforms
 
-open_collective: setup-php
 tidelift: "npm/setup-php"
 community_bridge: setup-php
 patreon: shivammathur

.github/ISSUE_TEMPLATE/bug_report.md

@@ -11,7 +11,7 @@ assignees: 'shivammathur'
 <!-- Please describe the bug concisely. -->
 
 **Version**
-- [ ] I have checked releases, and the bug exists in the latest patch version of `v1` or `v2`.
+- [ ] I have checked releases and the bug exists in the latest patch version of `v1` or `v2`.
 - [ ] `v2`
 - [ ] `v1`
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -11,7 +11,7 @@ assignees: 'shivammathur'
 <!-- Please describe concisely the feature you want to add. -->
 
 **Version**
-- [ ] I have checked releases, and the feature is missing in the latest patch version of `v2`.
+- [ ] I have checked releases and the feature is missing in the latest patch version of `v2`.
 
 **Underlying issue**
 <!-- Please describe the issue this would solve. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,12 +5,12 @@ labels: bug or enhancement
 
 ---
 
-## A Pull Request should be associated with a Discussion.
+## A Pull Request should be associated with an Issue.
 
-> If you're fixing a bug, adding a new feature or improving something please provide the details in discussions,
+> If you're fixing a bug, adding a new feature or improving something please provide the details in Issues,
 > so that the development can be pointed in the intended direction.
 
-Related discussion: <!-- Please link the related discussion -->
+Related issue: <!-- Please link the related issue -->
 
 > Further notes in [Contribution Guidelines](.github/CONTRIBUTING.md)
 > Thank you for your contribution.
@@ -30,7 +30,7 @@ This PR [briefly explain what it does]
 > In case this PR edits any scripts:
 
 - [ ] I have checked the edited scripts for syntax.
-- [ ] I have tested the changes in an integration test (If yes, provide workflow YAML and link).
+- [ ] I have tested the changes in an integration test (If yes, provide workflow link).
 
 <!--
 - Please target the develop branch when submitting the pull request.

.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.9.x   | :white_check_mark: |
-| 2.8.x   | :white_check_mark: |
+| 2.4.x   | :white_check_mark: |
 
 ## Supported PHP Versions
 

.github/workflows/docs.yml

@@ -1,77 +0,0 @@
-name: Docs workflow
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 15 * * 6'
-jobs:
-  create:
-    name: Create
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      fail-fast: false
-      matrix:
-        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
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-      - name: Save unix
-        env:
-          file: php${{ matrix.php-versions }}-${{ matrix.operating-system }}.md
-          version: ${{ matrix.php-versions }}
-        if: matrix.operating-system != 'windows-2019'
-        run: |
-          echo "## PHP $version" >> "$file"
-          printf "\n" >> "$file"
-          echo "\`\`\`" >> "$file"
-          php -m >> "$file"
-          echo "\`\`\`" >> "$file"
-          printf "\n" >> "$file"
-      - name: Save Windows
-        env:
-          file: php${{ matrix.php-versions }}-${{ matrix.operating-system }}.md
-          version: ${{ matrix.php-versions }}
-        if: matrix.operating-system == 'windows-2019'
-        run: |
-          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
-      - uses: actions/upload-artifact@v2
-        with:
-          name: lists
-          path: php${{ matrix.php-versions }}-${{ matrix.operating-system }}.md
-  update:
-    name: Update
-    needs: create
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          repository: ${{ github.repository }}.wiki
-      - uses: actions/download-artifact@v2
-        with:
-          path: ${{ github.workspace }}
-      - name: Combine
-        run: |
-          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 "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
-              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
-          if [ "$(git status --porcelain=v1 2>/dev/null | wc -l)" != "0" ]; then
-            git add .
-            git commit -m "Update PHP extensions on wiki - $(date +'%d-%m-%y')"
-            git push -f https://${{ github.repository_owner }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.wiki.git master || true
-          fi

.github/workflows/node-workflow.yml

@@ -28,10 +28,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Setup Node.js 14.x
+      - name: Setup Node.js 12.x
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 12.x
 
       - name: Install dependencies
         run: npm install

.github/workflows/workflow.yml

@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-latest, macos-latest]
-        php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
+        php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
     env:
       extensions: xml, opcache, xdebug, pcov
       key: cache-v3
@@ -34,7 +34,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup cache environment
-        id: cache-env
+        id: extcache
         uses: shivammathur/cache-extensions@develop
         with:
           php-version: ${{ matrix.php-versions }}
@@ -44,9 +44,9 @@ jobs:
       - name: Cache extensions
         uses: actions/cache@v2
         with:
-          path: ${{ steps.cache-env.outputs.dir }}
+          path: ${{ steps.extcache.outputs.dir }}
-          key: ${{ steps.cache-env.outputs.key }}
+          key: ${{ steps.extcache.outputs.key }}
-          restore-keys: ${{ steps.cache-env.outputs.key }}
+          restore-keys: ${{ steps.extcache.outputs.key }}
 
       - name: Setup PHP with extensions and custom config
         run: node dist/index.js

README.md

@@ -8,24 +8,19 @@
 
 <p align="center">
   <a href="https://github.com/shivammathur/setup-php" title="GitHub action to setup PHP"><img alt="GitHub Actions status" src="https://github.com/shivammathur/setup-php/workflows/Main%20workflow/badge.svg"></a>
-  <a href="https://codecov.io/gh/shivammathur/setup-php" title="Code coverage"><img alt="Codecov Code Coverage" src="https://img.shields.io/codecov/c/github/shivammathur/setup-php?logo=codecov"></a>
+  <a href="https://codecov.io/gh/shivammathur/setup-php" title="Code coverage"><img alt="Codecov Code Coverage" src="https://codecov.io/gh/shivammathur/setup-php/branch/master/graph/badge.svg"></a>
-  <a href="https://github.com/shivammathur/setup-php/blob/master/LICENSE" title="license"><img alt="LICENSE" src="https://img.shields.io/badge/license-MIT-428f7e.svg?logo=open%20source%20initiative&logoColor=white&labelColor=555555"></a>
+  <a href="https://github.com/shivammathur/setup-php/blob/master/LICENSE" title="license"><img alt="LICENSE" src="https://img.shields.io/badge/license-MIT-428f7e.svg"></a>
-  <a href="#tada-php-support" title="PHP Versions Supported"><img alt="PHP Versions Supported" src="https://img.shields.io/badge/php-5.3%20to%208.1-777bb3.svg?logo=php&logoColor=white&labelColor=555555"></a>  
+  <a href="#tada-php-support" title="PHP Versions Supported"><img alt="PHP Versions Supported" src="https://img.shields.io/badge/php-%3E%3D%205.3-8892BF.svg"></a>
-</p>
-<p align="center">  
-  <a href="https://reddit.com/r/setup_php" title="setup-php reddit"><img alt="setup-php reddit" src="https://img.shields.io/badge/reddit-join-FF5700?logo=reddit&logoColor=FF5700&labelColor=555555"></a>
-  <a href="https://twitter.com/setup_php" title="setup-php twitter"><img alt="setup-php twitter" src="https://img.shields.io/badge/twitter-follow-1DA1F2?logo=twitter&logoColor=1DA1F2&labelColor=555555"></a>
-  <a href="https://setup-php.statuspage.io/" title="setup-php status"><img alt="setup-php status" src="https://img.shields.io/badge/status-subscribe-28A745?logo=statuspage&logoColor=28A745&labelColor=555555"></a>  
 </p>
 
-Setup PHP with required extensions, php.ini configuration, code-coverage support and various tools like composer in [GitHub Actions](https://github.com/features/actions "GitHub Actions"). This action gives you a cross platform interface to set up the PHP environment you need to test your application. Refer to [Usage](#memo-usage "How to use this") section and [examples](#examples "Examples of use") to see how to use this.
+Setup PHP with required extensions, php.ini configuration, code-coverage support and various tools like composer in [GitHub Actions](https://github.com/features/actions "GitHub Actions"). This action gives you a cross platform interface to setup the PHP environment you need to test your application. Refer to [Usage](#memo-usage "How to use this") section and [examples](#examples "Examples of use") to see how to use this.
 
 ## 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)
@@ -34,17 +29,14 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
   - [Disable Coverage](#disable-coverage)
 - [Usage](#memo-usage)
   - [Inputs](#inputs)
-  - [Flags](#flags)
   - [Basic Setup](#basic-setup)
-  - [Matrix Setup](#matrix-setup)  
+  - [Matrix Setup](#matrix-setup)
   - [Nightly Build Setup](#nightly-build-setup)
-  - [Thread Safe Setup](#thread-safe-setup)
-  - [Force Update Setup](#force-update-setup)
-  - [Verbose Setup](#verbose-setup)  
-  - [Multi-Arch Setup](#multi-arch-setup)
   - [Self Hosted Setup](#self-hosted-setup)
   - [Local Testing Setup](#local-testing-setup)
-  - [JIT Configuration](#jit-configuration)
+  - [Thread Safe Setup](#thread-safe-setup)
+  - [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)
@@ -58,20 +50,36 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
 - [Dependencies](#package-dependencies)
 - [Further Reading](#bookmark_tabs-further-reading)
 
+## :tada: PHP Support
+
+|PHP Version|Stability|Release Support|Runner Support|
+|--- |--- |--- |--- |
+|`5.3`|`Stable`|`End of life`|`GitHub-hosted`|
+|`5.4`|`Stable`|`End of life`|`GitHub-hosted`|
+|`5.5`|`Stable`|`End of life`|`GitHub-hosted`|
+|`5.6`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
+|`7.0`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
+|`7.1`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
+|`7.2`|`Stable`|`Security fixes only`|`GitHub-hosted`, `self-hosted`|
+|`7.3`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`|
+|`7.4`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`|
+|`8.0`|`Nightly`|`In development`|`GitHub-hosted`, `self-hosted`|
+
+**Note:** Specifying `8.0` in `php-version` input installs a nightly build of `PHP 8.0.0-dev` with `PHP JIT`, `Union Types v2` and other [new features](https://wiki.php.net/rfc#php_80 "New features implemented in PHP 8"). See [nightly build setup](#nightly-build-setup) for more information.
+
 ## :cloud: OS/Platform Support
 
-Both `GitHub-hosted` and `self-hosted` runners are suppported by `setup-php` on the following OS/Platforms.
+Both `GitHub-hosted` runners and `self-hosted` runners are supported 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 8.0`|
+|Ubuntu 16.04|`ubuntu-16.04`|`PHP 5.6` to `PHP 7.4`|
-|Ubuntu 18.04|`ubuntu-18.04`|`PHP 7.1` to `PHP 8.0`|
+|Ubuntu 18.04|`ubuntu-latest` or `ubuntu-18.04`|`PHP 7.1` to `PHP 7.4`|
-|Ubuntu 20.04|`ubuntu-latest` or `ubuntu-20.04`|`PHP 7.4` to `PHP 8.0`|
+|Ubuntu 20.04|`ubuntu-20.04`|`PHP 7.4`|
-|Windows Server 2019|`windows-latest` or `windows-2019`|`PHP 8.0`|
+|Windows Server 2019|`windows-latest` or `windows-2019`|`PHP 7.4`|
-|macOS Catalina 10.15|`macos-latest` or `macos-10.15`|`PHP 8.0`|
+|macOS Catalina 10.15|`macos-latest` or `macos-10.15`|`PHP 7.4`|
-|macOS Big Sur 11.0|`macos-11.0`|`PHP 8.0`|
 
 ### Self-Hosted Runners
 
@@ -83,181 +91,95 @@ Both `GitHub-hosted` and `self-hosted` runners are suppported by `setup-php` on
 |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`|
-|`5.4`|`Stable`|`End of life`|`GitHub-hosted`|
-|`5.5`|`Stable`|`End of life`|`GitHub-hosted`|
-|`5.6`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
-|`7.0`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
-|`7.1`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
-|`7.2`|`Stable`|`End of life`|`GitHub-hosted`, `self-hosted`|
-|`7.3`|`Stable`|`Security fixes only`|`GitHub-hosted`, `self-hosted`|
-|`7.4`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`|
-|`8.0`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`|
-|`8.1`|`Nightly`|`In development`|`GitHub-hosted`, `self-hosted`|
-
-**Notes:** 
-- Specifying `8.1` in `php-version` input installs a nightly build of `PHP 8.1.0-dev`. See [nightly build setup](#nightly-build-setup) for more information.
-- To use JIT on `PHP 8.0` and `PHP 8.1` refer to the [JIT configuration](#jit-configuration) section.
 
 ## :heavy_plus_sign: PHP Extension Support
 
-PHP extensions can be setup using the `extensions` input. It accepts a `string` in csv-format.
+- On `ubuntu` by default extensions which are available as a package can be installed. PECL extensions if not available as a package can be installed by specifying `pecl` in the tools input.
-
-- On `Ubuntu`, extensions which are available as a package, available on `PECL`, or hosted on GitHub can be setup.
 
 ```yaml
-- name: Setup PHP with PECL extension
+uses: shivammathur/setup-php@v2
-  uses: shivammathur/setup-php@v2
+with:
-  with:
+  php-version: '7.4'
-    php-version: '7.4'
+  tools: pecl
-    extensions: imagick, swoole
+  extensions: swoole
 ```
 
-- On `Windows`, extensions available on `PECL` which have the `DLL` binary can be setup.
+- On `windows` PECL extensions which have the `DLL` binary can be installed.
 
-- On `macOS`, extensions available on `PECL` or hosted on GitHub can be installed.
+- On `macOS` PECL extensions can be installed.
 
 - Extensions installed along with PHP if specified are enabled.
 
-- 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.
+- Specific versions of PECL extensions can be installed by suffixing the version. This is useful for installing old versions of extensions which support end of life PHP versions.
 
 ```yaml
-- name: Setup PHP with specific version of PECL extension
+uses: shivammathur/setup-php@v2
-  uses: shivammathur/setup-php@v2
+with:
-  with:
+  php-version: '5.4'
-    php-version: '5.4'
+  tools: pecl
-    extensions: swoole-1.9.3
+  extensions: swoole-1.9.3
 ```
 
-- 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`.
+- Pre-release versions of PECL extensions can be setup by suffixing the extension with its state i.e `alpha`, `beta`, `devel` or `snapshot`.
 
 ```yaml
-- name: Setup PHP with pre-release PECL extension
+uses: shivammathur/setup-php@v2
-  uses: shivammathur/setup-php@v2
+with:
-  with:
+  php-version: '7.4'
-    php-version: '7.4'
+  tools: pecl
-    extensions: xdebug-beta
+  extensions: xdebug-beta
 ```
 
 - Shared extensions can be removed by prefixing them with a `:`.
 
 ```yaml
-- name: Setup PHP and remove shared extension
+uses: shivammathur/setup-php@v2
-  uses: shivammathur/setup-php@v2
+with:
-  with:
+  php-version: '7.4'  
-    php-version: '7.4'  
+  extensions: :opcache
-    extensions: :opcache
 ```
 
-- Extension `intl` can be setup with specific `ICU` version for `PHP 5.6` to `PHP 8.0` in `Ubuntu` workflows by suffixing `intl` with the `ICU` version. `ICU 50.2` and newer versions are supported. Refer to [`ICU builds`](https://github.com/shivammathur/icu-intl#icu4c-builds) for the specific versions supported.
+- Extensions which cannot be added or removed gracefully leave an error message in the logs, the action is not interrupted.
 
-```yaml
+- These extensions have custom support - `gearman` on `Ubuntu`, `blackfire`, `ioncube`, `oci8`, `pdo_oci`, `phalcon3` and `phalcon4` on all supported OS.
-- name: Setup PHP with intl
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: '7.4'
-    extensions: intl-68.2
-```
-
-- Extensions loaded by default after `setup-php` runs can be found on the [wiki](https://github.com/shivammathur/setup-php/wiki).
-
-- These extensions have custom support:
-  - `cubrid`, `pdo_cubrid` and `gearman` on `Ubuntu`.
-  - `geos` on `Ubuntu` and `macOS`.
-  - `blackfire`, `couchbase`, `ioncube`, `oci8`, `pdo_oci`, `pecl_http`, `phalcon3` and `phalcon4` on all supported OS.
-
-- By default, extensions which cannot be added or removed gracefully leave an error message in the logs, the action is not interrupted. To change this behaviour you can set `fail-fast` flag to `true`. 
-
-```yaml
-- name: Setup PHP with fail-fast
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: '7.4'
-    extensions: oci8
-  env:
-    fail-fast: true
-```
-
-- Extensions can be compiled from source if they are hosted on GitHub. In this case, the version specification contains the repository and branch/tag to clone: 
-
-```yaml
-- name: Setup PHP and remove shared extension
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: '7.4'  
-    extensions: mongodb-mongodb/mongo-php-driver@v1.9
-```
-
-The version can be a branch name or tag as supported by `git clone -b <name>`. The clone is performed recursively, i.e. submodules will be cloned as well.
 
 ## :wrench: Tools Support
 
-These tools can be setup globally using the `tools` input. It accepts a string in csv-format.
+These tools can be setup globally using the `tools` input.
 
-`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`
+`blackfire`, `blackfire-player`, `codeception`, `composer`, `composer-normalize`, `composer-prefetcher`, `composer-require-checker`, `composer-unused`, `cs2pr`, `deployer`, `flex`, `grpc_php_plugin`, `infection`, `pecl`, `phan`, `phinx`, `phive`, `phpcbf`, `phpcpd`, `php-config`, `php-cs-fixer`, `phpcs`, `phpize`, `phpmd`, `phpstan`, `phpunit`, `prestissimo`, `protoc`, `psalm`, `symfony`, `vapor-cli`
 
 ```yaml
-- name: Setup PHP with tools
+uses: shivammathur/setup-php@v2
-  uses: shivammathur/setup-php@v2
+with:
-  with:
+  php-version: '7.4'
-    php-version: '7.4'
+  tools: php-cs-fixer, phpunit
-    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 setup a particular version of a tool, specify it in the form `tool:version`.  
+Latest stable version of `composer` is setup by default. You can setup the required version by specifying `v1`, `v2`, `snapshot` or `preview` as version.
 
 ```yaml
-- name: Setup PHP with composer v2
+uses: shivammathur/setup-php@v2
-  uses: shivammathur/setup-php@v2
+with:
-  with:
+  php-version: '7.4'
-    php-version: '7.4'
+  tools: composer:v2
-    tools: composer:v2
 ```
 
-- Tools `prestissimo` and `composer-prefetcher` will be skipped unless `composer:v1` is also specified in tools input. It is recommended to drop `prestissimo` and use `composer v2`.
+Version for other tools should be in `semver` format and a valid release of the tool.
-
-- 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.
-
-- Version for other tools should be in `semver` format and a valid release of the tool. This is useful for installing tools for older versions of PHP. For example to set up `PHPUnit` on `PHP 7.2`.
 
 ```yaml
-- name: Setup PHP with tools
+uses: shivammathur/setup-php@v2
-  uses: shivammathur/setup-php@v2
+with:
-  with:
+  php-version: '7.4'
-    php-version: '7.2'
+  tools: php-cs-fixer:2.16.2, phpunit:8.5.1
-    tools: phpunit:8.5.8
-```
-
-- 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
-- name: Setup PHP with fail-fast
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: '7.4'
-    tools: deployer
-  env:
-    fail-fast: true
 ```
 
 **Notes**
-- Input `tools` is useful to set up tools which you only use in GitHub Actions, thus keeping your `composer.json` tidy.
+- Both agent `blackfire-agent` and client `blackfire` are setup when `blackfire` is specified in tools input.
-- If you do not want to use all your dev-dependencies in GitHub Actions workflow, you can run composer with `--no-dev` and install required tools using `tools` input to speed up your workflow.
+- Tools which cannot be setup gracefully leave an error message in the logs, the action is not interrupted.
-- If you have a tool in your `composer.json`, do not setup it with `tools` input as the two instances of the tool might conflict.
 
 ## :signal_strength: Coverage Support
 
@@ -267,56 +189,31 @@ Specify `coverage: xdebug` to use `Xdebug`.
 Runs on all [PHP versions supported](#tada-php-support "List of PHP versions supported on this GitHub Action").
 
 ```yaml
-- name: Setup PHP with Xdebug
+uses: shivammathur/setup-php@v2
-  uses: shivammathur/setup-php@v2
+with:
-  with:
+  php-version: '7.4'
-    php-version: '7.4'
+  coverage: xdebug
-    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.  
+Specify `coverage: pcov` to use `PCOV` and disable `Xdebug`.  
-Runs on PHP 7.1 and newer PHP versions.
+`PCOV` supports `PHP 7.1` and newer PHP versions.  
-  
+Tests with `PCOV` run much faster than with `Xdebug`.  
-- In most cases, tests with `PCOV` execute much faster than with `Xdebug`.  
+If your source code directory is other than `src`, `lib` or, `app`, specify `pcov.directory` using the `ini-values` input.  
-- 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
+uses: shivammathur/setup-php@v2
-  uses: shivammathur/setup-php@v2
+with:
-  with:
+  php-version: '7.4'
-    php-version: '7.4'
+  ini-values: pcov.directory=api #optional, see above for usage.
-    ini-values: pcov.directory=api #optional, see above for usage.
+  coverage: pcov
-    coverage: pcov
-```
-
-- PHPUnit 8.x and above supports PCOV out of the box.  
-- If you are using PHPUnit 5.x, 6.x or 7.x, you need to set up `pcov/clobber` before executing your tests.
-
-```yaml
-- name: Setup PCOV
-  run: |
-    composer require pcov/clobber
-    vendor/bin/pcov clobber
 ```
 
 ### Disable Coverage
 
-Specify `coverage: none` to remove both `Xdebug` and `PCOV`.
+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.
@@ -324,25 +221,20 @@ Disable coverage for these reasons:
 - You are profiling your code using `blackfire`.
 
 ```yaml
-- name: Setup PHP with no coverage driver
+uses: shivammathur/setup-php@v2
-  uses: shivammathur/setup-php@v2
+with:
-  with:
+  php-version: '7.4'
-    php-version: '7.4'
+  coverage: none
-    coverage: none
 ```
 
 ## :memo: Usage
 
 ### Inputs
 
-> Specify using `with` keyword
-
 #### `php-version` (required)
 
-- Specify the PHP version you want to set up.
+- Specify the PHP version you want to setup.
 - 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)
@@ -354,47 +246,21 @@ Disable coverage for these reasons:
 
 #### `ini-values` (optional)
 
-- Specify the values you want to add to `php.ini`. 
+- Specify the values you want to add to `php.ini`.
-- Accepts a `string` in csv-format. For example `post_max_size=256M, max_execution_time=180`.
+- Accepts a `string` in csv-format. For example `post_max_size=256M, short_open_tag=On`.
-- Accepts ini values with commas if wrapped in quotes. For example `xdebug.mode="develop,coverage"`.  
 
 #### `coverage` (optional)
 
-- Specify the code coverage driver you want to set up.
+- Specify the code coverage driver you want to setup.
 - Accepts `xdebug`, `pcov` or `none`.
 - See [coverage support](#signal_strength-coverage-support) for more info.
 
 #### `tools` (optional)
 
-- Specify the tools you want to set up.
+- Specify the tools you want to setup.
-- Accepts a `string` in csv-format. For example: `phpunit, phpcs`
+- Accepts a `string` in csv-format. For example `phpunit, phpcs`
 - See [tools Support](#wrench-tools-support) for tools supported.
 
-### Flags
-
-> Specify using `env` keyword
-
-#### `fail-fast` (optional)
-
-- Specify to mark the workflow as failed if an extension or tool fails to set up.
-- This changes the default mode from graceful warnings to fail-fast.
-- By default, it is set to `false`.
-- Accepts `true` and `false`.
-
-#### `phpts` (optional)
-
-- 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.
-
-#### `update` (optional)
-
-- 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 setup](#force-update-setup) for more info.
-
 See below for more info.
 
 ### Basic Setup
@@ -411,7 +277,7 @@ steps:
   with:
     php-version: '7.4'
     extensions: mbstring, intl
-    ini-values: post_max_size=256M, max_execution_time=180
+    ini-values: post_max_size=256M, short_open_tag=On
     coverage: xdebug    
     tools: php-cs-fixer, phpunit
 ```
@@ -426,13 +292,9 @@ 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: ['7.3', '7.4']
+        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
-        phpunit-versions: ['latest']
+    name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
-        include:
-        - operating-system: 'ubuntu-latest'
-          php-versions: '7.2'
-          phpunit-versions: '8.5.13'    
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -442,125 +304,43 @@ jobs:
       with:
         php-version: ${{ matrix.php-versions }}
         extensions: mbstring, intl
-        ini-values: post_max_size=256M, max_execution_time=180
+        ini-values: post_max_size=256M, short_open_tag=On
         coverage: xdebug        
-        tools: php-cs-fixer, phpunit:${{ matrix.phpunit-versions }}
+        tools: php-cs-fixer, phpunit
 ```
 
 ### Nightly Build Setup
 
-> Setup a nightly build of `PHP 8.1`. 
+> Setup a nightly build of `PHP 8.0.0-dev` from the [master branch](https://github.com/php/php-src/tree/master "Master branch on PHP source repository") of PHP.
 
 - This version is currently in development.
-- Some user space extensions might not support this version currently.
+- `PECL` is installed by default with this version on `ubuntu` and `macOS`.
+- Some extensions might not support this version currently.
+- Refer to this [RFC](https://wiki.php.net/rfc/jit "PHP JIT RFC configuration") for configuring `PHP JIT` on this version.
+- Refer to this [list of RFCs](https://wiki.php.net/rfc#php_80 "List of RFCs implemented in PHP8") implemented in this version.
 
 ```yaml
 steps:
 - name: Checkout
   uses: actions/checkout@v2
 
-- name: Setup nightly PHP
+- name: Setup PHP
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.1'
+    php-version: '8.0'
     extensions: mbstring
-    ini-values: post_max_size=256M, max_execution_time=180
+    ini-values: opcache.jit_buffer_size=256M, opcache.jit=1235, pcre.jit=1
-    coverage: xdebug
+    coverage: pcov
     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.
-
-- `PHP 5.6` to `PHP 7.4` are supported by `setup-php` on multiple architecture on `Ubuntu`.
-- For this, you can use `shivammathur/node` images as containers. These have compatible `Nodejs` and `spc` utility.
-- Using `spc` you can run `setup-php` on both `i386` and `amd64` containers as opposed to [default syntax](#basic-setup), which only supports `amd64`.
-- Currently, for `Arm` based setup, you will need [self-hosted runners](#self-hosted-setup).
-
-```yaml
-jobs:
-  run:
-    runs-on: ubuntu-latest
-    container: shivammathur/node:latest-${{ matrix.arch }}
-    strategy:
-      matrix:
-        arch: ["amd64", "i386"]
-    steps:
-      - name: Install PHP
-        run: |
-          # Update spc (See https://github.com/shivammathur/spc for options)
-          spc -U
-
-          # Install PHP
-          spc --php-version "7.4" \
-              --extensions "mbstring, intl" \
-              --ini-values "post_max_size=256M, max_execution_time=180" \
-              --coverage "xdebug" \
-              --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 setup a dockerized self-hosted runner, refer to this [guide](https://github.com/shivammathur/setup-php/wiki/Dockerized-self-hosted-runner-on-Ubuntu) to setup in an `Ubuntu` container and refer to this [guide](https://github.com/shivammathur/setup-php/wiki/Dockerized-self-hosted-runner-on-Windows) to setup 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.
+- To setup 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 [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.
+- 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.
 
 Specify the environment variable `runner` with the value `self-hosted`. Without this your workflow will fail.
 
@@ -584,11 +364,6 @@ jobs:
         runner: self-hosted # Specify the runner.
 ```
 
-**Notes**
-- Do not set up multiple self-hosted runners on a single server instance as parallel workflow will conflict with each other.
-- Do not set up self-hosted runners on the side on your development environment or your production server.
-- Avoid using the same labels for your `self-hosted` runners which are used by `GitHub-hosted` runners.
-
 ### Local Testing Setup
 
 > Test your `Ubuntu` workflow locally using [`nektos/act`](https://github.com/nektos/act "Project to test GitHub Actions locally").
@@ -608,9 +383,7 @@ 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 images.
+Run the workflow locally with `act` using [`shivammathur/node`](https://github.com/shivammathur/node-docker "Docker image to run setup-php") docker image.
-
-Choose the image tag which matches the `runs-on` property in your workflow:
 
 ```bash
 # For runs-on: ubuntu-latest
@@ -626,42 +399,115 @@ act -P ubuntu-18.04=shivammathur/node:bionic
 act -P ubuntu-16.04=shivammathur/node:xenial
 ```
 
-### JIT Configuration
+### Thread Safe Setup
 
-> Enable Just-in-time(JIT) on PHP 8.0 and PHP 8.1.
+> Setup both `TS` and `NTS` PHP on `Windows`.
 
-- To enable JIT, enable `opcache` in cli mode by setting `opcache.enable_cli=1`.
+- `NTS` versions are setup by default.
-- By default, `opcache.jit=1235` and `opcache.jit_buffer_size=256M` are set which can be changed using `ini-values` input.
+- On `Ubuntu` and `macOS` only `NTS` versions are supported.
-- 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").
+- On `Windows` both `TS` and `NTS` versions are supported.
-
-For example to enable JIT in `tracing` mode with buffer size of `64 MB`. 
 
 ```yaml
-- name: Setup PHP with JIT in tracing mode
+jobs:
+  run:
+    runs-on: windows-latest
+    name: Setup PHP TS on Windows
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '7.4'
+      env:
+        phpts: ts # specify ts or nts
+```
+
+### Force Update
+
+> Update to 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
   uses: shivammathur/setup-php@v2
   with:
-    php-version: '8.0'
+    php-version: '7.4'
-    ini-values: opcache.enable_cli=1, opcache.jit=tracing, opcache.jit_buffer_size=64M
+  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
+  uses: shivammathur/setup-php@verbose
+  with:
+    php-version: '7.4'
 ```
 
 ### Cache Extensions
 
-You can cache PHP extensions using `shivammathur/cache-extensions` and `action/cache` GitHub Actions. Extensions which take very long to set up when cached are available in the next workflow run and are enabled directly. This reduces the workflow execution time.  
+You can cache PHP extensions using [`shivammathur/cache-extensions`](https://github.com/shivammathur/cache-extensions "GitHub Action to cache php extensions") and [`action/cache`](https://github.com/actions/cache "GitHub Action to cache files") GitHub Actions. Extensions which take very long to setup when cached are available in the next workflow run and are enabled directly. This reduces the workflow execution time.
-Refer to [`shivammathur/cache-extensions`](https://github.com/shivammathur/cache-extensions "GitHub Action to cache php extensions") for details.
+
+```yaml
+runs-on: ${{ matrix.operating-system }}
+strategy:
+  matrix:
+    operating-system: [ubuntu-latest, windows-latest, macos-latest]
+    php-versions: ['7.2', '7.3', '7.4']
+name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
+env:
+  extensions: intl, pcov
+  key: cache-v1 # can be any string, change to clear the extension cache.
+steps:
+- name: Checkout
+  uses: actions/checkout@v2
+
+- name: Setup cache environment
+  id: extcache
+  uses: shivammathur/cache-extensions@v1
+  with:
+    php-version: ${{ matrix.php-versions }}
+    extensions: ${{ env.extensions }}
+    key: ${{ env.key }}
+
+- name: Cache extensions
+  uses: actions/cache@v2
+  with:
+    path: ${{ steps.extcache.outputs.dir }}
+    key: ${{ steps.extcache.outputs.key }}
+    restore-keys: ${{ steps.extcache.outputs.key }}
+
+- name: Setup PHP
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: ${{ matrix.php-versions }}
+    extensions: ${{ env.extensions }}
+```
+
+**Note:** If you setup both `TS` and `NTS` PHP versions on `windows`, add `${{ env.phpts }}` to `key` and `restore-keys` inputs in `actions/cache` step.
 
 ### Cache Composer Dependencies
 
-If your project uses composer, you can persist the composer's internal cache directory. Dependencies cached are loaded directly instead of downloading them while installation. The files cached are available across check-runs and will reduce the workflow execution time.
+If your project uses composer, you can persist composer's internal cache directory. Dependencies cached are loaded directly instead of downloading them while installation. The files cached are available across check-runs and will reduce the workflow execution time.
 
 ```yaml
 - name: Get composer cache directory
-  id: composer-cache
+  id: composercache
   run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
 - name: Cache dependencies
   uses: actions/cache@v2
   with:
-    path: ${{ steps.composer-cache.outputs.dir }}
+    path: ${{ steps.composercache.outputs.dir }}
     key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
     restore-keys: ${{ runner.os }}-composer-
 
@@ -670,36 +516,31 @@ If your project uses composer, you can persist the composer's internal cache dir
 ```
 
 **Notes**
-- Please do not cache `vendor` directory using `action/cache` as that will have side effects.
+- Please do not cache `vendor` directory using `action/cache` as that will have side-effects.
-- If you do not commit `composer.lock`, you can use the hash of `composer.json` as the key for your cache.
+- In the above example, if you support a range of `composer` dependencies and do not commit `composer.lock`, you can use the hash of `composer.json` as the key for your cache.
+
 ```yaml
 key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
 ```
 
-- If you support a range of `composer` dependencies and use `prefer-lowest` and `prefer-stable` options, you can store them in your matrix and add them to the keys.
-```yaml
-key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}-${{ matrix.prefer }}-
-restore-keys: ${{ runner.os }}-composer-${{ matrix.prefer }}-
-```
-
 ### Cache Node.js Dependencies
 
-If your project has node.js dependencies, you can persist NPM or yarn cache directory. The cached files are available across check-runs and will reduce the workflow execution time.
+If your project has node.js dependencies, you can persist npm's or yarn's cache directory. The cached files are available across check-runs and will reduce the workflow execution time.
 
 ```yaml
 - name: Get node.js cache directory
-  id: node-cache-dir
+  id: nodecache
   run: echo "::set-output name=dir::$(npm config get cache)" # Use $(yarn cache dir) for yarn
 
 - name: Cache dependencies
   uses: actions/cache@v2
   with:
-    path: ${{ steps.node-cache-dir.outputs.dir }}
+    path: ${{ steps.nodecache.outputs.dir }}
     key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} # Use '**/yarn.lock' for yarn
     restore-keys: ${{ runner.os }}-node-
 ```
 
-**Note:** Please do not cache `node_modules` directory as that will have side effects.
+**Note:** Please do not cache `node_modules` directory as that will have side-effects.
 
 ### Composer GitHub OAuth
 
@@ -716,11 +557,9 @@ If you have a number of workflows which setup multiple tools or have many compos
 
 ### Problem Matchers
 
-Problem matchers are `json` configurations which identify errors and warnings in your logs and surface them prominently in the GitHub Actions UI by highlighting them and creating code annotations.
-
 #### PHP
 
-Setup problem matchers for your `PHP` output by adding this step after the `setup-php` step.
+Setup problem matchers for your `PHP` output by adding this step after the `setup-php` step. This will scan the logs for PHP errors and warnings, and surface them prominently in the GitHub Actions UI by creating annotations and log file decorations.
 
 ```yaml
 - name: Setup problem matchers for PHP
@@ -729,59 +568,29 @@ Setup problem matchers for your `PHP` output by adding this step after the `setu
 
 #### PHPUnit
 
-Setup problem matchers for your `PHPUnit` output by adding this step after the `setup-php` step.
+Setup problem matchers for your `PHPUnit` output by adding this step after the `setup-php` step. This will scan the logs for failing tests and surface that information prominently in the GitHub Actions UI by creating annotations and log file decorations.
 
 ```yaml
 - name: Setup problem matchers for PHPUnit
   run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 ```
 
-#### PHPStan
+#### Other Tools
-
-PHPStan supports error reporting in GitHub Actions, so it does not require problem matchers.
-
-```yaml
-- name: Setup PHP
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: '7.4'
-    tools: phpstan
-
-- name: Run PHPStan
-  run: phpstan analyse src
-```
-
-#### Psalm
-
-Psalm supports error reporting in GitHub Actions with an output format `github`.
-
-```yaml
-- name: Setup PHP
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: '7.4'
-    tools: psalm
-
-- name: Run Psalm
-  run: psalm --output-format=github
-```
-
-#### Tools with checkstyle support
 
 For tools that support `checkstyle` reporting like `phpstan`, `psalm`, `php-cs-fixer` and `phpcs` you can use `cs2pr` to annotate your code.  
-For examples refer to [cs2pr documentation](https://github.com/staabm/annotate-pull-request-from-checkstyle).   
+For examples refer to [cs2pr documentation](https://github.com/staabm/annotate-pull-request-from-checkstyle).  
 
-> Here is an example with `phpcs`.
+> Here is an example with `phpstan`.
 
 ```yaml
 - name: Setup PHP
   uses: shivammathur/setup-php@v2
   with:
     php-version: '7.4'
-    tools: cs2pr, phpcs
+    tools: cs2pr, phpstan
 
-- name: Run phpcs
+- name: PHPStan
-  run: phpcs -q --report=checkstyle src | cs2pr
+  run: phpstan analyse src --error-format=checkstyle | cs2pr
 ```
 
 ### Examples
@@ -816,15 +625,15 @@ 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.
+- It is highly recommended to use the `v2` tag as `setup-php` version. It is a rolling tag and is synced with latest minor and patch releases. With `v2` you automatically get the bug fixes, new features and support for latest PHP releases. For debugging any issues `verbose` tag can be used temporarily. It outputs all the logs and is also synced with the latest releases.
 - Semantic release versions can also be used. It is recommended to [use dependabot](https://docs.github.com/en/github/administering-a-repository/keeping-your-actions-up-to-date-with-github-dependabot "Setup Dependabot with GitHub Actions") with semantic versioning to keep the actions in your workflows up to date.
 - Commit SHA can also be used, but are not recommended. They have to be updated with every release manually, without which you will not get any bug fixes 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.
+- Using the `master` branch as version is highly discouraged, 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.
+- If you are using the `v1` tag or a `1.x.y` version, it is recommended that you [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.
 
 ## :scroll: License
 
-- The scripts and documentation in this project are under the [MIT License](LICENSE "License for shivammathur/setup-php"). 
+- The scripts and documentation in this project are released under the [MIT License](LICENSE "License for shivammathur/setup-php"). 
 - This project has multiple [dependencies](#package-dependencies "Dependencies for this PHP Action"). Their licenses can be found in their respective repositories.
 - The logo for `setup-php` is a derivative work of [php.net logo](https://www.php.net/download-logos.php) and is licensed under the [CC BY-SA 4.0 License](https://creativecommons.org/licenses/by-sa/4.0/ "Creative Commons License").
 
@@ -833,60 +642,25 @@ 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 or want to suggest a feature/improvement, start a discussion [here](https://github.com/shivammathur/setup-php/discussions "Setup PHP discussions").
+- 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").
-
-*Join the list of setup-php contributors*
-
-<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%">
-  </a>
-</p>
 
 ## :sparkling_heart: Support This Project
 
-- If setup-php saved your developer time, please consider sponsoring setup-php:
+If this action helped you.
-  - [Open Collective](https://opencollective.com/setup-php "setup-php Open Collective")
-  - [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal")
-  - [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon")
-- Please [reach out](mailto:contact@setup-php.com) if you have any questions regarding sponsoring setup-php.
-- Please star the project and share it. If you blog, please share your experience of using this action.
 
-*Huge thanks to the following companies for supporting `setup-php`*
+- Sponsor the project by subscribing on [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon") or by contributing using [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal"). This project is also available as part of the [Tidelift Subscription](https://tidelift.com/subscription/pkg/npm-setup-php?utm_source=npm-setup-php&utm_medium=referral&utm_campaign=enterprise&utm_term=repo "Tidelift Subscription for setup-php") to support delivering enterprise-level maintenance.
-
+- Please star the project and dependencies. If you blog, please share your experience of using this action with the community.
-<p>
-  <a href="https://www.jetbrains.com/?from=setup-php">
-    <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://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://setup-php.com/sponsors//tidelift.png" alt="Tidelift" width="70" height="60">
-  </a>  
-</p>
 
 ## :package: Dependencies
 
 - [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")
-- [shivammathur/composer-cache](https://github.com/shivammathur/composer-cache "Cache composer releases")
-- [shivammathur/homebrew-extensions](https://github.com/shivammathur/homebrew-extensions "Tap for PHP extensions on MacOS")
 - [shivammathur/homebrew-php](https://github.com/shivammathur/homebrew-php "Tap for PHP builds on MacOS")
-- [shivammathur/icu-intl](https://github.com/shivammathur/icu-intl "icu4c and php-intl builds")
+- [shivammathur/homebrew-extensions](https://github.com/shivammathur/homebrew-extensions "Tap for PHP extensions on MacOS")
-- [shivammathur/php-builder](https://github.com/shivammathur/php-builder "Nightly PHP package for Ubuntu")
+- [shivammathur/php-builder](https://github.com/shivammathur/php-builder "Nightly PHP package")
-- [shivammathur/php-builder-windows](https://github.com/shivammathur/php-builder-windows "Nightly PHP package for Windows")
-- [shivammathur/php-ubuntu](https://github.com/shivammathur/php-ubuntu "Cache stable PHP Packages for Ubuntu")
 - [shivammathur/php5-darwin](https://github.com/shivammathur/php5-darwin "Scripts to setup PHP5 versions on darwin")
 - [shivammathur/php5-ubuntu](https://github.com/shivammathur/php5-ubuntu "Scripts to setup PHP5 versions on ubuntu")
 
@@ -894,4 +668,4 @@ Examples of using `setup-php` with various PHP Frameworks and Packages.
 
 - [About GitHub Actions](https://github.com/features/actions "GitHub Actions")
 - [GitHub Actions Syntax](https://help.github.com/en/articles/workflow-syntax-for-github-actions "GitHub Actions Syntax")
-- [Other Awesome Actions](https://github.com/sdras/awesome-actions "List of Awesome GitHub Actions")
+- [Other Awesome Actions](https://github.com/sdras/awesome-actions "List of Awesome GitHub Actions")

__tests__/config.test.ts

@@ -12,9 +12,9 @@ describe('Config tests', () => {
 
     win32 = await config.addINIValues(
       'post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata',
-      'openbsd'
+      'fedora'
     );
-    expect(win32).toContain('Platform openbsd is not supported');
+    expect(win32).toContain('Platform fedora is not supported');
   });
 
   it('checking addINIValuesOnLinux', async () => {
@@ -24,14 +24,14 @@ describe('Config tests', () => {
       true
     );
     expect(linux).toContain(
-      'echo "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata" | sudo tee -a "${pecl_file:-${ini_file[@]}}"'
+      'echo "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata"'
     );
 
     linux = await config.addINIValues(
       'post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata',
-      'openbsd'
+      'fedora'
     );
-    expect(linux).toContain('Platform openbsd is not supported');
+    expect(linux).toContain('Platform fedora is not supported');
   });
 
   it('checking addINIValuesOnDarwin', async () => {
@@ -40,13 +40,13 @@ describe('Config tests', () => {
       'darwin'
     );
     expect(darwin).toContain(
-      'echo "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata" | sudo tee -a "${pecl_file:-${ini_file[@]}}"'
+      'echo "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata"'
     );
 
     darwin = await config.addINIValues(
       'post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata',
-      'openbsd'
+      'fedora'
     );
-    expect(darwin).toContain('Platform openbsd is not supported');
+    expect(darwin).toContain('Platform fedora is not supported');
   });
 });

__tests__/coverage.test.ts

@@ -21,7 +21,7 @@ describe('Config tests', () => {
 
   it('checking addCoverage with PCOV on darwin', async () => {
     const darwin: string = await coverage.addCoverage('pcov', '7.4', 'darwin');
-    expect(darwin).toContain('add_brew_extension pcov');
+    expect(darwin).toContain('add_extension pcov');
     expect(darwin).toContain('remove_extension xdebug');
   });
 
@@ -30,29 +30,27 @@ 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', '8.0', 'linux');
+    const linux: string = await coverage.addCoverage('xdebug3', '7.4', 'linux');
-    expect(linux).toContain('add_extension xdebug');
+    expect(linux).toContain('add_extension_from_source xdebug');
+    expect(linux).toContain('echo "xdebug.mode=coverage"');
   });
 
-  it('checking addCoverage with Xdebug2 on linux', async () => {
+  it('checking addCoverage with Xdebug3 on linux', async () => {
-    const linux: string = await coverage.addCoverage('xdebug2', '7.4', 'linux');
+    const linux: string = await coverage.addCoverage('xdebug3', '8.0', 'linux');
-    expect(linux).toContain('add_pecl_extension xdebug 2.9.8 zend_extension');
+    expect(linux).toContain('add_extension xdebug');
+    expect(linux).toContain('echo "xdebug.mode=coverage"');
+  });
+
+  it('checking addCoverage with Xdebug on linux', async () => {
+    const linux: string = await coverage.addCoverage('xdebug', '8.0', 'linux');
+    expect(linux).toContain('add_extension xdebug');
+    expect(linux).toContain('echo "xdebug.mode=coverage"');
   });
 
   it('checking addCoverage with Xdebug on darwin', async () => {
@@ -61,25 +59,7 @@ describe('Config tests', () => {
       '7.4',
       'darwin'
     );
-    expect(darwin).toContain('add_brew_extension xdebug');
+    expect(darwin).toContain('add_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 () => {

__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, pecl_http, ioncube, oci8, pdo_oci, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2, sqlsrv-1.2.3preview1',
+      'Xdebug, pcov, sqlite, :intl, phalcon4, ioncube, oci8, pdo_oci, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2',
       '7.4',
       'win32'
     );
@@ -12,23 +12,18 @@ 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 oci8');
-    expect(win32).toContain('Add-Oci pdo_oci');
+    expect(win32).toContain('Add-OCI pdo_oci');
     expect(win32).toContain('Add-Extension ast beta');
     expect(win32).toContain('Add-Extension grpc stable 1.2.3');
     expect(win32).toContain('Add-Extension inotify alpha 1.2.3');
-    expect(win32).toContain('Add-Extension sqlsrv devel 1.2.3');
 
     win32 = await extensions.addExtension('pcov', '5.6', 'win32');
     expect(win32).toContain(
       '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');
@@ -51,34 +46,32 @@ describe('Extension tests', () => {
     expect(win32).toContain('Add-Phalcon phalcon3');
     expect(win32).toContain('Add-Extension does_not_exist');
 
-    win32 = await extensions.addExtension('xdebug', '7.2', 'openbsd');
+    win32 = await extensions.addExtension('xdebug', '7.2', 'fedora');
-    expect(win32).toContain('Platform openbsd is not supported');
+    expect(win32).toContain('Platform fedora is not supported');
 
     win32 = await extensions.addExtension('blackfire', '7.3', 'win32');
     expect(win32).toContain('Add-Blackfire blackfire');
 
     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, pcov, sqlite, :intl, ast, ast-beta, pdo_mysql, pdo-odbc, xdebug-alpha, grpc-1.2.3',
+      'Xdebug, xdebug3, pcov, sqlite, :intl, ast, uopz, ast-beta, pdo_mysql, pdo-odbc, xdebug-alpha, grpc-1.2.3',
       '7.4',
       'linux'
     );
-    expect(linux).toContain('add_extension xdebug');
+    expect(linux).toContain(
-    expect(linux).toContain('add_extension sqlite3');
+      'add_extension_from_source xdebug xdebug/xdebug master --enable-xdebug zend_extension'
+    );
+    expect(linux).toContain('sudo $debconf_fix apt-get install -y php7.4-pcov');
+    expect(linux).toContain(
+      'sudo $debconf_fix apt-get install -y php7.4-sqlite3'
+    );
     expect(linux).toContain('remove_extension intl');
+    expect(linux).toContain('sudo $debconf_fix apt-get install -y php-ast');
+    expect(linux).toContain('sudo $debconf_fix apt-get install -y php-uopz');
     expect(linux).toContain('add_unstable_extension ast beta extension');
     expect(linux).toContain('add_pdo_extension mysql');
     expect(linux).toContain('add_pdo_extension odbc');
@@ -87,31 +80,23 @@ describe('Extension tests', () => {
       'add_unstable_extension xdebug alpha zend_extension'
     );
 
+    linux = await extensions.addExtension('xdebug3', '8.0', 'linux');
+    expect(linux).toContain(
+      'sudo $debconf_fix apt-get install -y php8.0-xdebug'
+    );
+
     linux = await extensions.addExtension('pcov', '5.6', 'linux');
     expect(linux).toContain(
       'add_log "$cross" "pcov" "pcov is not supported on PHP 5.6"'
     );
 
-    linux = await extensions.addExtension('gearman', '5.6', 'linux');
+    linux = await extensions.addExtension('gearman', '7.0', 'linux');
     expect(linux).toContain('add_gearman');
     linux = await extensions.addExtension('gearman', '7.4', 'linux');
     expect(linux).toContain('add_gearman');
 
-    linux = await extensions.addExtension('couchbase', '5.6', 'linux');
+    linux = await extensions.addExtension('xdebug', '7.2', 'fedora');
-    expect(linux).toContain('add_couchbase');
+    expect(linux).toContain('Platform fedora is not supported');
-    linux = await extensions.addExtension('couchbase', '7.4', 'linux');
-    expect(linux).toContain('add_couchbase');
-
-    linux = await extensions.addExtension('pdo_cubrid', '7.0', 'linux');
-    expect(linux).toContain('add_cubrid pdo_cubrid');
-    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');
 
     linux = await extensions.addExtension('phalcon3, phalcon4', '7.3', 'linux');
     expect(linux).toContain('add_phalcon phalcon3');
@@ -120,15 +105,6 @@ 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');
@@ -138,44 +114,20 @@ describe('Extension tests', () => {
 
     linux = await extensions.addExtension('blackfire-1.31.0', '7.3', 'linux');
     expect(linux).toContain('add_blackfire blackfire-1.31.0');
-
-    linux = await extensions.addExtension('intl-65.1', '5.6', 'linux');
-    expect(linux).toContain('add_intl intl-65.1');
-
-    linux = await extensions.addExtension('intl-67.1', '7.3', 'linux');
-    expect(linux).toContain('add_intl intl-67.1');
-
-    linux = await extensions.addExtension('intl-68.2', '8.0', 'linux');
-    expect(linux).toContain('add_intl intl-68.2');
-
-    linux = await extensions.addExtension(
-      'mongodb-mongodb/mongo-php-driver@master',
-      '7.3',
-      'linux'
-    );
-    expect(linux).toContain(
-      'add_extension_from_github mongodb mongodb mongo-php-driver master'
-    );
   });
 
   it('checking addExtensionOnDarwin', async () => {
     let darwin: string = await extensions.addExtension(
-      'amqp, Xdebug, pcov, grpc, igbinary, imagick, imap, msgpack, protobuf, redis, swoole, sqlite, oci8, pdo_oci, :intl, ast-beta, grpc-1.2.3',
+      'Xdebug, pcov, grpc, protobuf, swoole, sqlite, oci8, pdo_oci, :intl, ast-beta, grpc-1.2.3',
       '7.2',
       'darwin'
     );
-    expect(darwin).toContain('add_brew_extension amqp extension');
+    expect(darwin).toContain('add_brew_extension xdebug');
-    expect(darwin).toContain('add_brew_extension xdebug zend_extension');
+    expect(darwin).toContain('add_brew_extension pcov');
-    expect(darwin).toContain('add_brew_extension pcov extension');
+    expect(darwin).toContain('add_brew_extension grpc');
-    expect(darwin).toContain('add_brew_extension grpc extension');
+    expect(darwin).toContain('add_brew_extension protobuf');
-    expect(darwin).toContain('add_brew_extension igbinary extension');
+    expect(darwin).toContain('add_brew_extension swoole');
-    expect(darwin).toContain('add_brew_extension imagick extension');
+    expect(darwin).toContain('pecl_install sqlite3');
-    expect(darwin).toContain('add_brew_extension imap extension');
-    expect(darwin).toContain('add_brew_extension msgpack extension');
-    expect(darwin).toContain('add_brew_extension protobuf extension');
-    expect(darwin).toContain('add_brew_extension redis extension');
-    expect(darwin).toContain('add_brew_extension swoole extension');
-    expect(darwin).toContain('add_extension sqlite3');
     expect(darwin).toContain('remove_extension intl');
     expect(darwin).toContain('add_unstable_extension ast beta extension');
     expect(darwin).toContain('add_pecl_extension grpc 1.2.3 extension');
@@ -186,24 +138,9 @@ describe('Extension tests', () => {
     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');
-
-    darwin = await extensions.addExtension('couchbase', '7.3', 'darwin');
-    expect(darwin).toContain('add_couchbase');
-
     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');
@@ -225,11 +162,19 @@ describe('Extension tests', () => {
     darwin = await extensions.addExtension('xdebug', '7.2', 'darwin');
     expect(darwin).toContain('add_brew_extension xdebug');
 
-    darwin = await extensions.addExtension('xdebug2', '7.2', 'darwin');
+    darwin = await extensions.addExtension('redis', '5.6', 'darwin');
-    expect(darwin).toContain('add_brew_extension xdebug2');
+    expect(darwin).toContain('pecl_install redis-2.2.8');
 
-    darwin = await extensions.addExtension('imagick', '5.5', 'darwin');
+    darwin = await extensions.addExtension('redis', '7.2', 'darwin');
-    expect(darwin).toContain('add_extension imagick');
+    expect(darwin).toContain('pecl_install redis');
+
+    darwin = await extensions.addExtension('imagick', '5.6', 'darwin');
+    expect(darwin).toContain('brew install pkg-config imagemagick');
+    expect(darwin).toContain('pecl_install imagick');
+
+    darwin = await extensions.addExtension('imagick', '7.4', 'darwin');
+    expect(darwin).toContain('brew install pkg-config imagemagick');
+    expect(darwin).toContain('pecl_install imagick');
 
     darwin = await extensions.addExtension('blackfire', '7.3', 'darwin');
     expect(darwin).toContain('add_blackfire blackfire');
@@ -245,16 +190,7 @@ describe('Extension tests', () => {
     );
     expect(darwin).toContain('add_extension does_not_exist');
 
-    darwin = await extensions.addExtension('xdebug', '7.2', 'openbsd');
+    darwin = await extensions.addExtension('xdebug', '7.2', 'fedora');
-    expect(darwin).toContain('Platform openbsd is not supported');
+    expect(darwin).toContain('Platform fedora is not supported');
-
-    darwin = await extensions.addExtension(
-      'mongodb-mongodb/mongo-php-driver@master',
-      '7.3',
-      'darwin'
-    );
-    expect(darwin).toContain(
-      'add_extension_from_github mongodb mongodb mongo-php-driver master'
-    );
   });
 });

__tests__/install.test.ts

@@ -1,11 +1,10 @@
 import * as install from '../src/install';
-import * as utils from '../src/utils';
 
 /**
  * Mock install.ts
  */
 jest.mock('../src/install', () => ({
-  getScript: jest.fn().mockImplementation(
+  build: jest.fn().mockImplementation(
     async (
       filename: string,
       version: string,
@@ -40,18 +39,24 @@ jest.mock('../src/install', () => ({
   run: jest.fn().mockImplementation(
     async (): Promise<string> => {
       const os_version: string = process.env['RUNNER_OS'] || '';
-      const version: string = await utils.parseVersion(
+      let version: string = process.env['php-version'] || '';
-        await utils.getInput('php-version', true)
+      version = version.length > 1 ? version.slice(0, 3) : version + '.0';
-      );
+      let script = '';
-      const tool = await utils.scriptTool(os_version);
+      switch (os_version) {
-      const filename = os_version + (await utils.scriptExtension(os_version));
+        case 'darwin':
-      return [
+        case 'linux':
-        await install.getScript(filename, version, os_version),
+          script = await install.build(os_version + '.sh', version, os_version);
-        tool,
+          script += 'bash script.sh ' + version + ' ' + __dirname;
-        filename,
+          break;
-        version,
+        case 'win32':
-        __dirname
+          script = await install.build(os_version + '.sh', version, os_version);
-      ].join(' ');
+          script += 'pwsh script.ps1 ' + version + ' ' + __dirname;
+          break;
+        default:
+          script += os_version + ' is not supported';
+      }
+
+      return script;
     }
   )
 }));
@@ -88,13 +93,13 @@ describe('Install', () => {
 
     let script: string = '' + (await install.run());
     expect(script).toContain('initial script');
-    expect(script).toContain('pwsh win32.ps1 7.0 ' + __dirname);
+    expect(script).toContain('pwsh script.ps1 7.0 ' + __dirname);
 
     setEnv('7.3', 'win32', '', '', '', '');
 
     script = '' + (await install.run());
     expect(script).toContain('initial script');
-    expect(script).toContain('pwsh win32.ps1 7.3 ' + __dirname);
+    expect(script).toContain('pwsh script.ps1 7.3 ' + __dirname);
 
     setEnv('7.3', 'win32', 'a, b', 'a=b', 'x', '');
 
@@ -103,7 +108,7 @@ describe('Install', () => {
     expect(script).toContain('install extensions');
     expect(script).toContain('edit php.ini');
     expect(script).toContain('set coverage driver');
-    expect(script).toContain('pwsh win32.ps1 7.3 ' + __dirname);
+    expect(script).toContain('pwsh script.ps1 7.3 ' + __dirname);
   });
 
   it('Test install on linux', async () => {
@@ -111,13 +116,7 @@ describe('Install', () => {
 
     let script: string = '' + (await install.run());
     expect(script).toContain('initial script');
-    expect(script).toContain('bash linux.sh 7.3 ');
+    expect(script).toContain('bash script.sh 7.3 ');
-
-    setEnv('latest', 'linux', '', '', '', '');
-
-    script = '' + (await install.run());
-    expect(script).toContain('initial script');
-    expect(script).toContain('bash linux.sh 8.0 ');
 
     setEnv('7.3', 'linux', 'a, b', 'a=b', 'x', 'phpunit');
 
@@ -126,7 +125,7 @@ describe('Install', () => {
     expect(script).toContain('install extensions');
     expect(script).toContain('edit php.ini');
     expect(script).toContain('set coverage driver');
-    expect(script).toContain('bash linux.sh 7.3');
+    expect(script).toContain('bash script.sh 7.3');
     expect(script).toContain('add_tool');
   });
 
@@ -135,7 +134,7 @@ describe('Install', () => {
 
     let script: string = '' + (await install.run());
     expect(script).toContain('initial script');
-    expect(script).toContain('bash darwin.sh 7.3 ' + __dirname);
+    expect(script).toContain('bash script.sh 7.3 ' + __dirname);
 
     setEnv('7.3', 'darwin', 'a, b', 'a=b', 'x', '');
 
@@ -144,7 +143,7 @@ describe('Install', () => {
     expect(script).toContain('install extensions');
     expect(script).toContain('edit php.ini');
     expect(script).toContain('set coverage driver');
-    expect(script).toContain('bash darwin.sh 7.3 ' + __dirname);
+    expect(script).toContain('bash script.sh 7.3 ' + __dirname);
   });
 
   it('Test malformed version inputs', async () => {
@@ -152,24 +151,18 @@ describe('Install', () => {
 
     let script: string = '' + '' + (await install.run());
     expect(script).toContain('initial script');
-    expect(script).toContain('bash darwin.sh 7.4 ' + __dirname);
+    expect(script).toContain('bash script.sh 7.4 ' + __dirname);
 
     setEnv(8.0, 'darwin', '', '', '', '');
 
     script = '' + (await install.run());
     expect(script).toContain('initial script');
-    expect(script).toContain('bash darwin.sh 8.0 ' + __dirname);
+    expect(script).toContain('bash script.sh 8.0 ' + __dirname);
 
     setEnv(8, 'darwin', '', '', '', '');
 
     script = '' + (await install.run());
     expect(script).toContain('initial script');
-    expect(script).toContain('bash darwin.sh 8.0 ' + __dirname);
+    expect(script).toContain('bash script.sh 8.0 ' + __dirname);
-
-    setEnv(8.1, 'darwin', '', '', '', '');
-
-    script = '' + (await install.run());
-    expect(script).toContain('initial script');
-    expect(script).toContain('bash darwin.sh 8.1 ' + __dirname);
   });
 });

__tests__/matchers.test.ts

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

__tests__/tools.test.ts

@@ -1,6 +1,31 @@
+import * as httpm from '@actions/http-client';
 import * as tools from '../src/tools';
 
+httpm.HttpClient.prototype.get = jest.fn().mockImplementation(() => {
+  return {
+    message: null,
+    readBody: jest.fn().mockImplementation(() => {
+      return JSON.stringify({
+        stable: [{path: '/composer-stable.phar'}],
+        preview: [{path: '/composer-preview.phar'}],
+        snapshot: [{path: '/composer.phar'}],
+        '1': [{path: '/composer-1.phar'}],
+        '2': [{path: '/composer-2.phar'}]
+      });
+    })
+  };
+});
+
 describe('Tools tests', () => {
+  it('checking getCommand', async () => {
+    expect(await tools.getCommand('linux', 'tool')).toBe('add_tool ');
+    expect(await tools.getCommand('darwin', 'tool')).toBe('add_tool ');
+    expect(await tools.getCommand('win32', 'tool')).toBe('Add-Tool ');
+    expect(await tools.getCommand('fedora', 'tool')).toContain(
+      'Platform fedora is not supported'
+    );
+  });
+
   it('checking parseToolVersion', async () => {
     expect(await tools.getToolVersion('latest')).toBe('latest');
     expect(await tools.getToolVersion('1.2.3')).toBe('1.2.3');
@@ -79,23 +104,102 @@ 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', '7.4', 'linux');
+    let script: string = await tools.addPhive('1.2.3', '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', '5.5', 'win32');
+    script = await tools.addPhive('latest', '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://github.com/phar-io/phive/releases/download/0.12.1/phive-0.12.1.phar phive'
+      'Add-Tool https://phar.io/releases/phive.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'
     );
   });
 
@@ -108,21 +212,6 @@ describe('Tools tests', () => {
     );
   });
 
-  it('checking getBlackfirePlayerUrl', async () => {
-    expect(await tools.getBlackfirePlayerUrl('latest', '7.4')).toBe(
-      'https://get.blackfire.io/blackfire-player.phar'
-    );
-    expect(await tools.getBlackfirePlayerUrl('latest', '5.5')).toBe(
-      'https://get.blackfire.io/blackfire-player-v1.9.3.phar'
-    );
-    expect(await tools.getBlackfirePlayerUrl('latest', '7.0')).toBe(
-      'https://get.blackfire.io/blackfire-player-v1.9.3.phar'
-    );
-    expect(await tools.getBlackfirePlayerUrl('1.2.3', '7.0')).toBe(
-      'https://get.blackfire.io/blackfire-player-v1.2.3.phar'
-    );
-  });
-
   it('checking getDeployerUri', async () => {
     expect(await tools.getDeployerUrl('latest')).toBe(
       'https://deployer.org/deployer.phar'
@@ -143,17 +232,9 @@ describe('Tools tests', () => {
       'a',
       'b'
     ]);
-    expect(await tools.addComposer(['a', 'b', 'composer:1.2'])).toStrictEqual([
-      'composer',
-      'a',
-      'b'
-    ]);
     expect(
       await tools.addComposer(['a', 'b', 'composer:1.2.3'])
-    ).toStrictEqual(['composer:1.2.3', 'a', 'b']);
+    ).toStrictEqual(['composer', 'a', 'b']);
-    expect(
-      await tools.addComposer(['a', 'b', 'composer:v1.2.3'])
-    ).toStrictEqual(['composer:1.2.3', 'a', 'b']);
     expect(
       await tools.addComposer(['a', 'b', 'composer:snapshot'])
     ).toStrictEqual(['composer:snapshot', 'a', 'b']);
@@ -193,21 +274,6 @@ describe('Tools tests', () => {
     expect(await tools.getComposerUrl('2')).toContain(
       'https://getcomposer.org/composer-2.phar'
     );
-    expect(await tools.getComposerUrl('1.7.2')).toContain(
-      'https://github.com/composer/composer/releases/download/1.7.2/composer.phar'
-    );
-    expect(await tools.getComposerUrl('1.7.2')).toContain(
-      'https://getcomposer.org/composer-1.7.2.phar'
-    );
-    expect(await tools.getComposerUrl('2.0.0-RC2')).toContain(
-      'https://github.com/composer/composer/releases/download/2.0.0-RC2/composer.phar'
-    );
-    expect(await tools.getComposerUrl('2.0.0-RC2')).toContain(
-      'https://getcomposer.org/composer-2.0.0-RC2.phar'
-    );
-    expect(await tools.getComposerUrl('wrong')).toContain(
-      'https://getcomposer.org/composer-stable.phar'
-    );
   });
 
   it('checking getSymfonyUri', async () => {
@@ -229,24 +295,21 @@ describe('Tools tests', () => {
     expect(await tools.getSymfonyUri('1.2.3', 'win32')).toContain(
       'releases/download/v1.2.3/symfony_windows_amd64'
     );
-    expect(await tools.getSymfonyUri('1.2.3', 'openbsd')).toContain(
+    expect(await tools.getSymfonyUri('1.2.3', 'fedora')).toContain(
-      'Platform openbsd is not supported'
+      'Platform fedora is not supported'
     );
   });
 
   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'
+      'tool, composer:1.2.3, robmorgan/phinx, hirak/prestissimo, narrowspark/automatic-composer-prefetcher'
     );
     expect(tools_list).toStrictEqual([
       'composer',
       'tool',
-      'behat',
-      'composer-unused',
-      'vapor-cli',
       'phinx',
-      'phpspec',
+      'prestissimo',
-      'flex'
+      'composer-prefetcher'
     ]);
   });
 
@@ -262,60 +325,62 @@ describe('Tools tests', () => {
   it('checking addArchive', async () => {
     let script: string = await tools.addArchive(
       'tool',
+      '1.2.3',
       'https://tool.com/tool.phar',
-      'linux',
+      'linux'
-      '-v'
     );
     expect(script).toContain('add_tool https://tool.com/tool.phar tool');
     script = await tools.addArchive(
       'tool',
+      '1.2.3',
       'https://tool.com/tool.phar',
-      'darwin',
+      'darwin'
-      '-v'
     );
     expect(script).toContain('add_tool https://tool.com/tool.phar tool');
     script = await tools.addArchive(
       'tool',
+      '1.2.3',
       'https://tool.com/tool.phar',
-      'win32',
+      'win32'
-      '-v'
     );
     expect(script).toContain('Add-Tool https://tool.com/tool.phar tool');
 
     script = await tools.addArchive(
       'tool',
+      '1.2.3',
       'https://tool.com/tool.phar',
-      'openbsd',
+      'fedora'
-      '-v'
     );
-    expect(script).toContain('Platform openbsd is not supported');
+    expect(script).toContain('Platform fedora is not supported');
   });
 
   it('checking addDevTools', async () => {
     let script: string = await tools.addDevTools('phpize', 'linux');
-    expect(script).toContain('add_devtools phpize');
+    expect(script).toContain('add_devtools');
+    expect(script).toContain('add_log "$tick" "phpize" "Added"');
 
     script = await tools.addDevTools('php-config', 'linux');
-    expect(script).toContain('add_devtools php-config');
+    expect(script).toContain('add_devtools');
+    expect(script).toContain('add_log "$tick" "php-config" "Added"');
 
     script = await tools.addDevTools('phpize', 'darwin');
-    expect(script).toContain('add_devtools phpize');
+    expect(script).toContain('add_log "$tick" "phpize" "Added"');
 
     script = await tools.addDevTools('php-config', 'darwin');
-    expect(script).toContain('add_devtools php-config');
+    expect(script).toContain('add_log "$tick" "php-config" "Added"');
 
     script = await tools.addDevTools('phpize', 'win32');
     expect(script).toContain(
-      'Add-Log "$tick" "phpize" "phpize is not a windows tool"'
+      'Add-Log "$cross" "phpize" "phpize is not a windows tool"'
     );
 
     script = await tools.addDevTools('php-config', 'win32');
     expect(script).toContain(
-      'Add-Log "$tick" "php-config" "php-config is not a windows tool"'
+      'Add-Log "$cross" "php-config" "php-config is not a windows tool"'
     );
 
-    script = await tools.addDevTools('tool', 'openbsd');
+    script = await tools.addDevTools('tool', 'fedora');
-    expect(script).toContain('Platform openbsd is not supported');
+    expect(script).toContain('Platform fedora is not supported');
   });
 
   it('checking addPackage', async () => {
@@ -333,46 +398,54 @@ describe('Tools tests', () => {
     script = await tools.addPackage('tool', 'tool:1.2.3', 'user/', 'win32');
     expect(script).toContain('Add-Composertool tool tool:1.2.3 user/');
 
-    script = await tools.addPackage('tool', 'tool:1.2.3', 'user/', 'openbsd');
+    script = await tools.addPackage('tool', 'tool:1.2.3', 'user/', 'fedora');
-    expect(script).toContain('Platform openbsd is not supported');
+    expect(script).toContain('Platform fedora is not supported');
+  });
+
+  it('checking addCustomTool', async () => {
+    let script: string = await tools.addCustomTool('tool', '1.2.3', 'linux');
+    expect(script).toContain('tool.sh\nadd_tool 1.2.3');
+
+    script = await tools.addCustomTool('tool', '1.2.3', 'darwin');
+    expect(script).toContain('tool.sh\nadd_tool 1.2.3');
+
+    script = await tools.addCustomTool('tool', '1.2.3', 'win32');
+    expect(script).toContain('tool.ps1\nAdd-Tool 1.2.3');
   });
 
   it('checking addTools on linux', async () => {
     const script: string = await tools.addTools(
-      'blackfire, blackfire-player, cs2pr, flex, grpc_php_plugin, php-cs-fixer, phplint, phpstan, phpunit, pecl, phing, phinx, phinx:1.2.3, phive, php-config, phpize, protoc, symfony, wp-cli',
+      'blackfire, blackfire-player, cs2pr, flex, grpc_php_plugin, php-cs-fixer, phplint, phpstan, phpunit, pecl, phinx, phinx:1.2.3, phive, php-config, phpize, protoc, symfony, wp-cli',
       '7.4',
       'linux'
     );
     expect(script).toContain('add_blackfire');
     expect(script).toContain(
-      'add_tool https://get.blackfire.io/blackfire-player.phar blackfire-player "-V"'
+      'add_tool https://get.blackfire.io/blackfire-player.phar blackfire-player'
     );
     expect(script).toContain(
       'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-stable.phar,https://getcomposer.org/composer-stable.phar composer'
     );
     expect(script).toContain(
-      'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr "-V"'
+      'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr'
     );
     expect(script).toContain(
-      'add_tool https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/latest/download/php-cs-fixer.phar php-cs-fixer "-V"'
+      'add_tool https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/latest/download/php-cs-fixer.phar php-cs-fixer'
     );
     expect(script).toContain(
-      'add_tool https://github.com/phpstan/phpstan/releases/latest/download/phpstan.phar phpstan "-V"'
+      'add_tool https://github.com/phpstan/phpstan/releases/latest/download/phpstan.phar phpstan'
     );
     expect(script).toContain(
-      'add_tool https://www.phing.info/get/phing-latest.phar phing "-v"'
+      'add_tool https://phar.io/releases/phive.phar phive'
     );
     expect(script).toContain(
-      'add_tool https://phar.io/releases/phive.phar phive status'
+      'add_tool https://phar.phpunit.de/phpunit.phar phpunit'
     );
     expect(script).toContain(
-      'add_tool https://phar.phpunit.de/phpunit.phar phpunit "--version"'
+      'add_tool https://github.com/symfony/cli/releases/latest/download/symfony_linux_amd64 symfony'
     );
     expect(script).toContain(
-      'add_tool https://github.com/symfony/cli/releases/latest/download/symfony_linux_amd64 symfony version'
+      'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli'
-    );
-    expect(script).toContain(
-      'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli "--version"'
     );
     expect(script).toContain('add_protoc latest');
     expect(script).toContain('add_grpc_php_plugin latest');
@@ -381,15 +454,16 @@ describe('Tools tests', () => {
     expect(script).toContain('add_composertool phinx phinx robmorgan/');
     expect(script).toContain('add_composertool phplint phplint overtrue/');
     expect(script).toContain('add_composertool phinx phinx:1.2.3 robmorgan/');
-    expect(script).toContain('add_devtools php-config');
+    expect(script).toContain('add_devtools');
-    expect(script).toContain('add_devtools phpize');
+    expect(script).toContain('add_log "$tick" "php-config" "Added"');
+    expect(script).toContain('add_log "$tick" "phpize" "Added"');
   });
   it('checking addTools on darwin', async () => {
     const listOfTools = [
-      'behat',
       'blackfire',
       'blackfire-player',
       'composer-normalize',
+      'composer-prefetcher:1.2.3',
       'composer-require-checker',
       'composer-unused',
       'cs2pr:1.2.3',
@@ -398,7 +472,6 @@ describe('Tools tests', () => {
       'infection',
       'phan',
       'phan:2.7.2',
-      'phing:1.2.3',
       'phinx',
       'phive:1.2.3',
       'php-config',
@@ -407,10 +480,9 @@ describe('Tools tests', () => {
       'phpcs',
       'phpize',
       'phpmd',
-      'phpspec',
       'protoc:v1.2.3',
       'psalm',
-      'symfony-cli',
+      'symfony',
       'symfony:1.2.3',
       'vapor-cli',
       'wp-cli'
@@ -424,76 +496,75 @@ describe('Tools tests', () => {
 
     expect(script).toContain('add_blackfire');
     expect(script).toContain(
-      'add_tool https://get.blackfire.io/blackfire-player.phar blackfire-player "-V"'
+      'add_tool https://get.blackfire.io/blackfire-player.phar blackfire-player'
     );
     expect(script).toContain(
       'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-stable.phar,https://getcomposer.org/composer-stable.phar composer'
     );
     expect(script).toContain(
-      'add_tool https://github.com/ergebnis/composer-normalize/releases/latest/download/composer-normalize.phar composer-normalize "-V"'
+      'add_tool https://github.com/ergebnis/composer-normalize/releases/latest/download/composer-normalize.phar composer-normalize'
     );
     expect(script).toContain(
-      'add_tool https://github.com/maglnet/ComposerRequireChecker/releases/latest/download/composer-require-checker.phar composer-require-checker "-V"'
+      'add_tool https://github.com/maglnet/ComposerRequireChecker/releases/latest/download/composer-require-checker.phar composer-require-checker'
     );
     expect(script).toContain(
-      'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/download/1.2.3/cs2pr cs2pr "-V"'
+      'add_tool https://github.com/composer-unused/composer-unused/releases/latest/download/composer-unused.phar composer-unused'
     );
     expect(script).toContain(
-      'add_tool https://github.com/infection/infection/releases/latest/download/infection.phar infection "-V"'
+      'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/download/1.2.3/cs2pr cs2pr'
     );
     expect(script).toContain(
-      'add_tool https://github.com/phan/phan/releases/latest/download/phan.phar phan "-v"'
+      'add_tool https://github.com/infection/infection/releases/latest/download/infection.phar infection'
     );
     expect(script).toContain(
-      'add_tool https://www.phing.info/get/phing-1.2.3.phar phing "-v"'
+      'add_tool https://github.com/phan/phan/releases/latest/download/phan.phar phan'
     );
     expect(script).toContain(
-      'add_tool https://github.com/squizlabs/PHP_CodeSniffer/releases/latest/download/phpcs.phar phpcs "--version"'
+      'add_tool https://github.com/squizlabs/PHP_CodeSniffer/releases/latest/download/phpcs.phar phpcs'
     );
     expect(script).toContain(
-      'add_tool https://github.com/squizlabs/PHP_CodeSniffer/releases/latest/download/phpcbf.phar phpcbf "--version"'
+      'add_tool https://github.com/squizlabs/PHP_CodeSniffer/releases/latest/download/phpcbf.phar phpcbf'
     );
     expect(script).toContain(
-      'add_tool https://phar.phpunit.de/phpcpd.phar phpcpd "--version"'
+      'add_tool https://phar.phpunit.de/phpcpd.phar phpcpd'
     );
     expect(script).toContain(
-      'add_tool https://github.com/phpmd/phpmd/releases/latest/download/phpmd.phar phpmd "--version"'
+      'add_tool https://github.com/phpmd/phpmd/releases/latest/download/phpmd.phar phpmd'
     );
     expect(script).toContain(
-      'https://github.com/vimeo/psalm/releases/latest/download/psalm.phar psalm "-v"'
+      'https://github.com/vimeo/psalm/releases/latest/download/psalm.phar psalm'
     );
     expect(script).toContain('add_grpc_php_plugin 1.2.3');
     expect(script).toContain('add_protoc 1.2.3');
-    expect(script).toContain('add_composertool behat behat behat/');
-    expect(script).toContain('add_composertool phpspec phpspec phpspec/');
     expect(script).toContain('add_composertool vapor-cli vapor-cli laravel/');
     expect(script).toContain('add_composertool flex flex symfony/');
     expect(script).toContain('add_composertool phinx phinx robmorgan/');
     expect(script).toContain(
-      'add_tool https://github.com/phan/phan/releases/download/2.7.2/phan.phar phan "-v"'
+      'add_tool https://github.com/phan/phan/releases/download/2.7.2/phan.phar phan'
     );
     expect(script).toContain(
       'add_tool https://github.com/phar-io/phive/releases/download/1.2.3/phive-1.2.3.phar phive'
     );
     expect(script).toContain(
-      'add_composertool composer-unused composer-unused icanhazstring/'
+      'add_composertool composer-prefetcher composer-prefetcher:1.2.3 narrowspark/automatic-'
     );
     expect(script).toContain(
-      'add_tool https://github.com/symfony/cli/releases/latest/download/symfony_darwin_amd64 symfony version'
+      'add_tool https://github.com/symfony/cli/releases/latest/download/symfony_darwin_amd64 symfony'
     );
     expect(script).toContain(
-      'add_tool https://github.com/symfony/cli/releases/download/v1.2.3/symfony_darwin_amd64 symfony version'
+      'add_tool https://github.com/symfony/cli/releases/download/v1.2.3/symfony_darwin_amd64 symfony'
     );
     expect(script).toContain(
-      'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli "--version"'
+      'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli'
     );
-    expect(script).toContain('add_devtools phpize');
+    expect(script).toContain('add_log "$tick" "phpize" "Added"');
-    expect(script).toContain('add_devtools php-config');
+    expect(script).toContain('add_log "$tick" "php-config" "Added"');
   });
   it('checking addTools on windows', async () => {
     const listOfTools = [
       'blackfire',
       'blackfire-player:1.8.1',
+      'codeception',
       'cs2pr',
       'deployer',
       'does_not_exist',
@@ -503,8 +574,9 @@ describe('Tools tests', () => {
       'php-config',
       'phpize',
       'phpmd',
+      'prestissimo',
       'symfony',
-      'wp'
+      'wp-cli'
     ];
 
     const script: string = await tools.addTools(
@@ -515,30 +587,31 @@ describe('Tools tests', () => {
 
     expect(script).toContain('Add-Blackfire');
     expect(script).toContain(
-      'Add-Tool https://get.blackfire.io/blackfire-player-v1.8.1.phar blackfire-player "-V"'
+      'Add-Tool https://get.blackfire.io/blackfire-player-v1.8.1.phar blackfire-player'
     );
     expect(script).toContain(
       'Add-Tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-stable.phar,https://getcomposer.org/composer-stable.phar composer'
     );
     expect(script).toContain(
-      'Add-Tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr "-V"'
+      'Add-Tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr'
     );
     expect(script).toContain('Add-Composertool flex flex symfony/');
     expect(script).toContain(
-      'Add-Tool https://deployer.org/deployer.phar deployer "-V"'
+      'Add-Tool https://deployer.org/deployer.phar deployer'
     );
+    expect(script).toContain('Add-Composertool prestissimo prestissimo hirak/');
     expect(script).toContain(
-      'Add-Tool https://github.com/phpmd/phpmd/releases/latest/download/phpmd.phar phpmd "--version"'
+      'Add-Tool https://github.com/phpmd/phpmd/releases/latest/download/phpmd.phar phpmd'
     );
     expect(script).toContain('Add-Composertool phinx phinx robmorgan/');
     expect(script).toContain(
-      'Add-Tool https://github.com/phar-io/phive/releases/download/0.13.2/phive-0.13.2.phar phive status'
+      'Add-Tool https://github.com/phar-io/phive/releases/download/0.13.2/phive-0.13.2.phar phive'
     );
     expect(script).toContain(
-      'Add-Tool https://github.com/symfony/cli/releases/latest/download/symfony_windows_amd64.exe symfony version'
+      'Add-Tool https://github.com/symfony/cli/releases/latest/download/symfony_windows_amd64.exe symfony'
     );
     expect(script).toContain(
-      'Add-Tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli "--version"'
+      'Add-Tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli'
     );
     expect(script).toContain('phpize is not a windows tool');
     expect(script).toContain('php-config is not a windows tool');
@@ -546,8 +619,6 @@ describe('Tools tests', () => {
   });
   it('checking addTools with composer tool using user/tool as input', async () => {
     const listOfTools = [
-      'composer:v1',
-      'codeception/codeception',
       'hirak/prestissimo',
       'narrowspark/automatic-composer-prefetcher',
       'robmorgan/phinx'
@@ -560,7 +631,7 @@ describe('Tools tests', () => {
     );
 
     expect(script).toContain(
-      'Add-Tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-1.phar,https://getcomposer.org/composer-1.phar composer'
+      'Add-Tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-stable.phar,https://getcomposer.org/composer-stable.phar composer'
     );
     expect(script).toContain('Add-Composertool prestissimo prestissimo hirak/');
     expect(script).toContain('Add-Composertool phinx phinx robmorgan/');
@@ -583,7 +654,7 @@ describe('Tools tests', () => {
 
     script = await tools.addTools('composer:preview', '7.4', 'linux');
     expect(script).toContain(
-      'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-preview.phar,https://getcomposer.org/composer-preview.phar composer preview'
+      'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-preview.phar,https://getcomposer.org/composer-preview.phar composer'
     );
     script = await tools.addTools(
       'composer:v1, composer:preview, composer:snapshot',
@@ -591,7 +662,7 @@ describe('Tools tests', () => {
       'linux'
     );
     expect(script).toContain(
-      'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-snapshot.phar,https://getcomposer.org/composer.phar composer snapshot'
+      'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-snapshot.phar,https://getcomposer.org/composer.phar composer'
     );
   });
 });

__tests__/utils.test.ts

@@ -8,12 +8,6 @@ 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) {
@@ -23,45 +17,23 @@ async function cleanup(path: string): Promise<void> {
 }
 
 describe('Utils tests', () => {
-  it('checking readEnv', async () => {
-    process.env['test'] = 'setup-php';
-    expect(await utils.readEnv('test')).toBe('setup-php');
-    expect(await utils.readEnv('undefined')).toBe('');
-  });
-
   it('checking getInput', async () => {
     process.env['test'] = 'setup-php';
+    process.env['undefined'] = '';
     expect(await utils.getInput('test', false)).toBe('setup-php');
+    expect(await utils.getInput('undefined', false)).toBe('');
     expect(await utils.getInput('setup-php', false)).toBe('setup-php');
     expect(await utils.getInput('DoesNotExist', false)).toBe('');
-    expect(async () => {
-      await utils.getInput('DoesNotExist', true);
-    }).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('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(
+    await utils.asyncForEach(array, async function (
-      array,
+      str: string
-      async function (str: string): Promise<void> {
+    ): Promise<void> {
-        concat += str;
+      concat += str;
-      }
+    });
-    );
     expect(concat).toBe('abc');
   });
 
@@ -98,25 +70,25 @@ describe('Utils tests', () => {
     const runner_dir: string = process.env['RUNNER_TOOL_CACHE'] || '';
     const script_path: string = path.join(runner_dir, 'test.sh');
     await utils.writeScript('test.sh', testString);
-    await fs.readFile(
+    await fs.readFile(script_path, function (
-      script_path,
+      error: Error | null,
-      function (error: Error | null, data: Buffer) {
+      data: Buffer
-        expect(testString).toBe(data.toString());
+    ) {
-      }
+      expect(testString).toBe(data.toString());
-    );
+    });
     await cleanup(script_path);
   });
 
-  it('checking packageArray', async () => {
+  it('checking extensionArray', async () => {
-    expect(await utils.packageArray('a, b, php_c, php-d')).toEqual([
+    expect(await utils.extensionArray('a, b, php_c, php-d')).toEqual([
       'a',
       'b',
       'c',
       'd'
     ]);
 
-    expect(await utils.packageArray('')).toEqual([]);
+    expect(await utils.extensionArray('')).toEqual([]);
-    expect(await utils.packageArray(' ')).toEqual([]);
+    expect(await utils.extensionArray(' ')).toEqual([]);
   });
 
   it('checking INIArray', async () => {
@@ -125,20 +97,6 @@ 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([]);
   });
@@ -173,8 +131,8 @@ describe('Utils tests', () => {
     expect(step_log).toEqual('step_log "Test message"');
     step_log = await utils.stepLog(message, 'darwin');
     expect(step_log).toEqual('step_log "Test message"');
-    step_log = await utils.stepLog(message, 'openbsd');
+    step_log = await utils.stepLog(message, 'fedora');
-    expect(step_log).toContain('Platform openbsd is not supported');
+    expect(step_log).toContain('Platform fedora is not supported');
 
     let add_log: string = await utils.addLog(
       'tick',
@@ -187,8 +145,8 @@ describe('Utils tests', () => {
     expect(add_log).toEqual('add_log "tick" "xdebug" "enabled"');
     add_log = await utils.addLog('tick', 'xdebug', 'enabled', 'darwin');
     expect(add_log).toEqual('add_log "tick" "xdebug" "enabled"');
-    add_log = await utils.addLog('tick', 'xdebug', 'enabled', 'openbsd');
+    add_log = await utils.addLog('tick', 'xdebug', 'enabled', 'fedora');
-    expect(add_log).toContain('Platform openbsd is not supported');
+    expect(add_log).toContain('Platform fedora is not supported');
   });
 
   it('checking getExtensionPrefix', async () => {
@@ -205,8 +163,8 @@ describe('Utils tests', () => {
     expect(await utils.suppressOutput('win32')).toEqual(' >$null 2>&1');
     expect(await utils.suppressOutput('linux')).toEqual(' >/dev/null 2>&1');
     expect(await utils.suppressOutput('darwin')).toEqual(' >/dev/null 2>&1');
-    expect(await utils.suppressOutput('openbsd')).toContain(
+    expect(await utils.suppressOutput('fedora')).toContain(
-      'Platform openbsd is not supported'
+      'Platform fedora is not supported'
     );
   });
 
@@ -216,15 +174,6 @@ describe('Utils tests', () => {
     );
   });
 
-  it('checking getCommand', async () => {
-    expect(await utils.getCommand('linux', 'tool')).toBe('add_tool ');
-    expect(await utils.getCommand('darwin', 'tool')).toBe('add_tool ');
-    expect(await utils.getCommand('win32', 'tool')).toBe('Add-Tool ');
-    expect(await utils.getCommand('openbsd', 'tool')).toContain(
-      'Platform openbsd is not supported'
-    );
-  });
-
   it('checking joins', async () => {
     expect(await utils.joins('a', 'b', 'c')).toBe('a b c');
   });
@@ -233,30 +182,8 @@ describe('Utils tests', () => {
     expect(await utils.scriptExtension('linux')).toBe('.sh');
     expect(await utils.scriptExtension('darwin')).toBe('.sh');
     expect(await utils.scriptExtension('win32')).toBe('.ps1');
-    expect(await utils.scriptExtension('openbsd')).toContain(
+    expect(await utils.scriptExtension('fedora')).toContain(
-      'Platform openbsd is not supported'
+      'Platform fedora is not supported'
     );
   });
-
-  it('checking scriptTool', async () => {
-    expect(await utils.scriptTool('linux')).toBe('bash');
-    expect(await utils.scriptTool('darwin')).toBe('bash');
-    expect(await utils.scriptTool('win32')).toBe('pwsh');
-    expect(await utils.scriptTool('openbsd')).toContain(
-      'Platform openbsd is not supported'
-    );
-  });
-
-  it('checking customPackage', async () => {
-    const script_path: string = path.join('ext', 'pkg.sh');
-    expect(await utils.customPackage('pkg', 'ext', '1.2.3', 'linux')).toContain(
-      script_path + '\nadd_pkg 1.2.3'
-    );
-    expect(
-      await utils.customPackage('pdo_pkg', 'ext', '1.2.3', 'linux')
-    ).toContain(script_path + '\nadd_pkg 1.2.3');
-    expect(
-      await utils.customPackage('pkg8', 'ext', '1.2.3', 'linux')
-    ).toContain(script_path + '\nadd_pkg 1.2.3');
-  });
 });

action.yml

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

examples/bedrock.yml

@@ -17,11 +17,11 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

examples/cakephp-mysql.yml

@@ -37,12 +37,12 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -70,12 +70,12 @@ jobs:
           php-version: '7.3'
           extensions: mbstring, intl
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -98,12 +98,12 @@ jobs:
           extensions: mbstring, intl
           tools: phpstan
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

examples/cakephp-postgres.yml

@@ -35,12 +35,12 @@ jobs:
           extensions: mbstring, intl, redis, pdo_pgsql
           coverage: pcov
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -68,12 +68,12 @@ jobs:
           php-version: '7.3'
           extensions: mbstring, intl
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -96,12 +96,12 @@ jobs:
           extensions: mbstring, intl
           tools: phpstan
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

examples/cakephp.yml

@@ -19,12 +19,12 @@ jobs:
           extensions: mbstring, intl, pdo_sqlite, pdo_mysql
           coverage: pcov #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -48,12 +48,12 @@ jobs:
           php-version: '7.3'
           extensions: mbstring, intl
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -76,12 +76,12 @@ jobs:
           extensions: mbstring, intl
           tools: phpstan
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

examples/codeigniter.yml

@@ -18,12 +18,12 @@ jobs:
           extensions: mbstring, intl, curl, dom
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

examples/laravel-mysql.yml

@@ -44,12 +44,12 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

examples/laravel-postgres.yml

@@ -44,12 +44,12 @@ jobs:
           extensions: mbstring, dom, fileinfo, pgsql
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

examples/laravel.yml

@@ -20,12 +20,12 @@ jobs:
           extensions: mbstring, dom, fileinfo
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

examples/lumen-mysql.yml

@@ -44,12 +44,12 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

examples/lumen-postgres.yml

@@ -44,12 +44,12 @@ jobs:
           extensions: mbstring, dom, fileinfo, pgsql
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

examples/lumen.yml

@@ -20,12 +20,12 @@ jobs:
           extensions: mbstring, dom, fileinfo, mysql
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

examples/phalcon-mysql.yml

@@ -44,12 +44,12 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

examples/phalcon-postgres.yml

@@ -43,12 +43,12 @@ jobs:
           extensions: mbstring, dom, zip, phalcon4, pgsql #use phalcon3 for the phalcon 3.x
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

examples/sage.yml

@@ -33,12 +33,12 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: ${{ runner.os }}-yarn-
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

examples/slim-framework.yml

@@ -18,12 +18,12 @@ jobs:
           extensions: mbstring, simplexml, dom
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

examples/symfony-mysql.yml

@@ -31,26 +31,25 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
         run: |
-          composer require --dev symfony/orm-pack symfony/phpunit-bridge
           composer install --no-progress --prefer-dist --optimize-autoloader
-          php bin/phpunit install
       - name: Run Migration
         run: |
+          composer require symfony/orm-pack
           php bin/console doctrine:schema:update --force || echo "No migrations found or schema update failed"
           php bin/console doctrine:migrations:migrate || echo "No migrations found or migration failed"
         env:
           DATABASE_URL: mysql://root:symfony@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/symfony
       - name: Run Tests
-        run: php bin/phpunit --coverage-text
+        run: php bin/phpunit --coverage-text

examples/symfony-postgres.yml

@@ -29,26 +29,25 @@ jobs:
           extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite, pgsql
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
         run: |
-          composer require --dev symfony/orm-pack symfony/phpunit-bridge
           composer install --no-progress --prefer-dist --optimize-autoloader
-          php bin/phpunit install
       - name: Run Migration
         run: |
+          composer require symfony/orm-pack
           php bin/console doctrine:schema:update --force || echo "No migrations found or schema update failed"
           php bin/console doctrine:migrations:migrate || echo "No migrations found or migration failed"
         env:
           DATABASE_URL: postgres://postgres:postgres@127.0.0.1:${{ job.services.postgres.ports[5432] }}/postgres?charset=UTF-8
       - name: Run Tests
-        run: php bin/phpunit --coverage-text
+        run: php bin/phpunit --coverage-text

examples/symfony.yml

@@ -20,20 +20,19 @@ jobs:
           extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
         run: |
-          composer require --dev symfony/phpunit-bridge
+          composer require symfony/orm-pack
           composer install --no-progress --prefer-dist --optimize-autoloader
-          php bin/phpunit install
       - name: Run Tests
-        run: php bin/phpunit --coverage-text
+        run: php bin/phpunit --coverage-text

examples/yii2-mysql.yml

@@ -41,12 +41,12 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

examples/yii2-postgres.yml

@@ -39,12 +39,12 @@ jobs:
           extensions: mbstring, intl, gd, imagick, zip, dom, pgsql
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

examples/zend-framework.yml

@@ -18,12 +18,12 @@ jobs:
           extensions: mbstring, bcmath, curl, intl
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

package.json

@@ -1,12 +1,12 @@
 {
   "name": "setup-php",
-  "version": "2.10.0",
+  "version": "2.4.1",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc",
-    "lint": "eslint **/*.ts --cache --fix",
+    "lint": "eslint **/*.ts --cache",
     "format": "prettier --write **/*.ts && git add .",
     "format-check": "prettier --check **/*.ts",
     "release": "ncc build src/install.ts -o dist && git add -f dist/",
@@ -24,28 +24,29 @@
   "author": "shivammathur",
   "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.2.6",
+    "@actions/core": "^1.2.4",
     "@actions/exec": "^1.0.4",
+    "@actions/http-client": "^1.0.8",
     "@actions/io": "^1.0.2",
     "fs": "0.0.1-security"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.20",
+    "@types/jest": "^26.0.8",
-    "@types/node": "^14.14.31",
+    "@types/node": "^14.0.27",
-    "@typescript-eslint/eslint-plugin": "^4.15.1",
+    "@typescript-eslint/eslint-plugin": "^3.7.1",
-    "@typescript-eslint/parser": "^4.15.1",
+    "@typescript-eslint/parser": "^3.7.1",
-    "@vercel/ncc": "^0.27.0",
+    "@zeit/ncc": "^0.22.3",
-    "eslint": "^7.20.0",
+    "eslint": "^7.6.0",
-    "eslint-config-prettier": "^8.0.0",
+    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-import": "^2.22.0",
-    "eslint-plugin-jest": "^24.1.5",
+    "eslint-plugin-jest": "^23.20.0",
-    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-prettier": "^3.1.4",
-    "husky": "^4.3.8",
+    "husky": "^4.2.5",
-    "jest": "^26.6.3",
+    "jest": "^26.2.2",
-    "jest-circus": "^26.6.3",
+    "jest-circus": "^26.2.2",
-    "prettier": "^2.2.1",
+    "prettier": "^2.0.5",
-    "ts-jest": "^26.5.1",
+    "ts-jest": "^26.1.4",
-    "typescript": "^4.1.5"
+    "typescript": "^3.9.7"
   },
   "husky": {
     "skipCI": true,

src/config.ts

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

src/configs/httpd-php-apache.conf

@@ -1,3 +0,0 @@
-LoadModule phpPHP_MAJOR_module PHP_DIR\PHP_APACHE_DLL
-AddHandler application/x-httpd-php .php
-PHPIniDir PHP_DIR

src/configs/httpd-php-cgi.conf

@@ -1,8 +0,0 @@
-LoadModule proxy_module modules/mod_proxy.so
-LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
-LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so
-<FilesMatch "\.php$">
-  <If "-f %{REQUEST_FILENAME}">
-    SetHandler "proxy:fcgi://127.0.0.1:9000/"
-  </If>
-</FilesMatch>

src/configs/nginx.conf

@@ -1,36 +0,0 @@
-worker_processes  1;
-
-events {
-    worker_connections  1024;
-}
-
-http {
-    include       mime.types;
-    default_type  application/octet-stream;
-
-    sendfile        on;
-
-    keepalive_timeout  65;
-
-    server {
-        listen       80;
-        server_name  localhost;
-
-        location / {
-            root   html;
-            index  index.php index.html index.htm;
-        }
-
-        error_page   500 502 503 504  /50x.html;
-        location = /50x.html {
-            root   html;
-        }
-        location ~ \.php$ {
-            root           html;
-            fastcgi_pass   127.0.0.1:9000;
-            fastcgi_index  index.php;
-            fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        fastcgi_params;
-        }
-    }
-}

src/configs/php-versions.json

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

src/configs/virtual_hosts/darwin/httpd-vhosts.conf

@@ -1,5 +0,0 @@
-<VirtualHost *:80>
-    ServerAdmin webmaster@localhost
-    DocumentRoot "/var/www/html"
-    ServerName localhost
-</VirtualHost>

src/configs/virtual_hosts/linux/default_apache

@@ -1,7 +0,0 @@
-<VirtualHost *:80>
-        ServerName localhost
-        ServerAdmin webmaster@localhost
-        DocumentRoot /var/www/html
-        ErrorLog ${APACHE_LOG_DIR}/error.log
-        CustomLog ${APACHE_LOG_DIR}/access.log combined
-</VirtualHost>

src/configs/virtual_hosts/linux/default_nginx

@@ -1,22 +0,0 @@
-server {
-    listen 80 default_server;
-    listen [::]:80 default_server;
-
-    root /var/www/html;
-    index index.html index.htm index.php;
-
-    server_name localhost;
-
-    location / {
-        try_files $uri $uri/ =404;
-    }
-
-    location ~ \.php$ {
-        include snippets/fastcgi-php.conf;
-        fastcgi_pass unix:/run/php/phpPHP_VERSION-fpm.sock;
-    }
-
-    location ~ /\.ht {
-        deny all;
-    }
-}

src/coverage.ts

@@ -19,13 +19,25 @@ export async function addCoverageXdebug(
   const xdebug =
     (await extensions.addExtension(extension, version, os_version, true)) +
     pipe;
+  const ini = await config.addINIValues(
+    'xdebug.mode=coverage',
+    os_version,
+    true
+  );
   const log = await utils.addLog(
     '$tick',
     extension,
     'Xdebug enabled as coverage driver',
     os_version
   );
-  return xdebug + '\n' + log;
+  switch (true) {
+    case /^xdebug3$/.test(extension):
+    case /^8\.0$/.test(version):
+      return '\n' + xdebug + '\n' + ini + '\n' + log;
+    case /^xdebug$/.test(extension):
+    default:
+      return xdebug + '\n' + log;
+  }
 }
 
 /**
@@ -140,11 +152,8 @@ export async function addCoverage(
     case 'xdebug':
     case 'xdebug3':
       return (
-        script + (await addCoverageXdebug('xdebug', version, os_version, pipe))
+        script +
-      );
+        (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

@@ -1,51 +1,79 @@
+import * as path from 'path';
 import * as utils from './utils';
 
+/**
+ * Function to get script to install custom extensions
+ *
+ * @param script
+ * @param command
+ */
+export async function customExtension(
+  script: string,
+  ...command: string[]
+): Promise<string> {
+  return (
+    '\n. ' +
+    path.join(__dirname, '../src/scripts/ext/' + script) +
+    '\n' +
+    (await utils.joins(...command))
+  );
+}
+
 /**
  * Install and enable extensions for darwin
  *
  * @param extension_csv
  * @param version
+ * @param pipe
  */
 export async function addExtensionDarwin(
   extension_csv: string,
-  version: string
+  version: string,
+  pipe: string
 ): Promise<string> {
-  const extensions: Array<string> = await utils.packageArray(extension_csv);
+  const extensions: Array<string> = await utils.extensionArray(extension_csv);
   let add_script = '\n';
   let remove_script = '';
   await utils.asyncForEach(extensions, async function (extension: string) {
     const version_extension: string = version + extension;
     const [ext_name, ext_version]: string[] = extension.split('-');
     const ext_prefix = await utils.getExtensionPrefix(ext_name);
-    let matches: RegExpExecArray;
+    const command_prefix = 'pecl_install ';
-
+    let command = '';
     switch (true) {
       // match :extension
       case /^:/.test(ext_name):
         remove_script += '\nremove_extension ' + ext_name.slice(1);
         return;
-      // match 5.3blackfire...8.0blackfire
+      // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-      // match 5.3blackfire-(semver)...8.0blackfire-(semver)
+      // match 5.3blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
-      // match couchbase, pdo_oci, oci8, http, pecl_http
+      case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
-      // match 5.3ioncube...7.4ioncube, 5.3geos...7.4geos
-      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
-      case /^(5\.[3-6]|7\.[0-4]|8\.0)blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
-      case /^couchbase$|^pdo_oci$|^oci8$|^http|^pecl_http|^pdo_firebird$/.test(
+        add_script += await customExtension(
-        extension
+          'blackfire.sh',
-      ):
+          'add_blackfire',
-      case /^(5\.[3-6]|7\.[0-4])(ioncube|geos)$/.test(version_extension):
+          extension
+        );
+        return;
+      // match pdo_oci and oci8
+      case /^pdo_oci$|^oci8$/.test(extension):
+        add_script += await customExtension('oci.sh', 'add_oci', extension);
+        return;
+      // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
+      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
+        add_script += await customExtension('ioncube.sh', 'add_ioncube');
+        return;
+      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
       case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-        add_script += await utils.customPackage(
+        add_script += await customExtension(
-          ext_name,
+          'phalcon.sh',
-          'ext',
+          'add_phalcon',
-          extension,
+          extension
-          'darwin'
         );
         return;
       // match pre-release versions. For example - xdebug-beta
-      case /.+-(stable|beta|alpha|devel|snapshot|rc|preview)/.test(extension):
+      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
         add_script += await utils.joins(
           '\nadd_unstable_extension',
           ext_name,
@@ -53,21 +81,8 @@ export async function addExtensionDarwin(
           ext_prefix
         );
         return;
-      // match extensions from GitHub. Do this before checking for semver as
-      // the version may match that as well
-      case /.+-.+\/.+@.+/.test(extension):
-        matches = /.+-(.+)\/(.+)@(.+)/.exec(extension) as RegExpExecArray;
-        add_script += await utils.joins(
-          '\nadd_extension_from_github',
-          ext_name,
-          matches[1],
-          matches[2],
-          matches[3],
-          ext_prefix
-        );
-        return;
       // match semver
-      case /.+-\d+\.\d+\.\d+.*/.test(extension):
+      case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
         add_script += await utils.joins(
           '\nadd_pecl_extension',
           ext_name,
@@ -79,28 +94,40 @@ export async function addExtensionDarwin(
       case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
         add_script += await utils.getUnsupportedLog('pcov', version, 'darwin');
         return;
-      // match 5.6 to 8.9 for amqp, grpc, igbinary, imagick, imap, msgpack, protobuf, raphf, redis, swoole, xdebug, xdebug2, zmq
+      // match 5.6xdebug to 8.0xdebug, 5.6swoole to 8.0swoole
-      // match 7.1 to 8.9 for pcov
+      // match 5.6grpc to 7.4grpc, 5.6protobuf to 7.4protobuf
-      // match 5.6 to 7.4 for propro
+      // match 7.1pcov to 8.0pcov
-      case /(5\.6|7\.[0-4]|8\.[0-9])(amqp|grpc|igbinary|imagick|imap|msgpack|protobuf|raphf|redis|swoole|xdebug|xdebug2|zmq)/.test(
+      case /(5\.6|7\.[0-4]|8\.[0-9])xdebug/.test(version_extension):
-        version_extension
+      case /(5\.6|7\.[0-4])(grpc|protobuf|swoole)/.test(version_extension):
-      ):
-      case /(5\.6|7\.[0-4])propro/.test(version_extension):
       case /(7\.[1-4]|8\.[0-9])pcov/.test(version_extension):
-        add_script += await utils.joins(
+        command = 'add_brew_extension ' + ext_name;
-          '\nadd_brew_extension',
+        break;
-          ext_name,
+      // match 5.6redis
-          ext_prefix
+      case /5\.6redis/.test(version_extension):
+        command = command_prefix + 'redis-2.2.8';
+        break;
+      // match imagick
+      case /^imagick$/.test(extension):
+        command = await utils.joins(
+          'brew install pkg-config imagemagick' + pipe,
+          '&& ' + command_prefix + 'imagick' + pipe
         );
-        return;
+        break;
       // match sqlite
       case /^sqlite$/.test(extension):
         extension = 'sqlite3';
+        command = command_prefix + extension;
         break;
       default:
+        command = command_prefix + extension;
         break;
     }
-    add_script += await utils.joins('\nadd_extension', extension, ext_prefix);
+    add_script += await utils.joins(
+      '\nadd_extension',
+      extension,
+      '"' + command + '"',
+      ext_prefix
+    );
   });
   return add_script + remove_script;
 }
@@ -115,7 +142,7 @@ export async function addExtensionWindows(
   extension_csv: string,
   version: string
 ): Promise<string> {
-  const extensions: Array<string> = await utils.packageArray(extension_csv);
+  const extensions: Array<string> = await utils.extensionArray(extension_csv);
   let add_script = '\n';
   let remove_script = '';
   await utils.asyncForEach(extensions, async function (extension: string) {
@@ -127,45 +154,43 @@ export async function addExtensionWindows(
       case /^:/.test(ext_name):
         remove_script += '\nRemove-Extension ' + ext_name.slice(1);
         break;
-      // match 5.3blackfire...8.0blackfire
+      // match 5.4blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-      // match 5.3blackfire-(semver)...8.0blackfire-(semver)
+      // match 5.4blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
-      // match pdo_oci and oci8
+      case /^(5\.[4-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
-      // match 5.3ioncube...7.4ioncube
-      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
-      // 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$|^pdo_firebird$/.test(extension):
+        add_script += await customExtension(
-      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
+          'blackfire.ps1',
-      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+          'Add-Blackfire',
-      case /^(7\.[1-4]|8\.0)(http|pecl_http)$/.test(version_extension):
+          extension
-        add_script += await utils.customPackage(
-          ext_name,
-          'ext',
-          extension,
-          'win32'
         );
-        return;
+        break;
+      // match pdo_oci and oci8
+      case /^pdo_oci$|^oci8$/.test(extension):
+        add_script += await customExtension('oci.ps1', 'Add-OCI', extension);
+        break;
+      // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
+      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
+        add_script += await customExtension('ioncube.ps1', 'Add-Ioncube');
+        break;
+      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
+      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+        add_script += await customExtension(
+          'phalcon.ps1',
+          'Add-Phalcon',
+          extension
+        );
+        break;
       // match pre-release versions. For example - xdebug-beta
-      case /.+-(stable|beta|alpha|devel|snapshot)/.test(extension):
+      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
         add_script += await utils.joins(
           '\nAdd-Extension',
           ext_name,
-          ext_version.replace('stable', '')
+          ext_version
-        );
-        break;
-      // match extensions from GitHub. Do this before checking for semver as
-      // the version may match that as well
-      case /.+-.+\/.+@.+/.test(extension):
-        add_script += await utils.getUnsupportedLog(
-          extension,
-          version,
-          'win32'
         );
         break;
       // match semver without state
-      case /.+-\d+\.\d+\.\d+$/.test(extension):
+      case /.*-\d+\.\d+\.\d+$/.test(version_extension):
         add_script += await utils.joins(
           '\nAdd-Extension',
           ext_name,
@@ -174,21 +199,19 @@ export async function addExtensionWindows(
         );
         break;
       // match semver with state
-      case /.+-\d+\.\d+\.\d+[a-zA-Z]+\d*/.test(extension):
+      case /.*-(\d+\.\d+\.\d)(beta|alpha|devel|snapshot)\d*/.test(
-        matches = /.+-(\d+\.\d+\.\d+)([a-zA-Z]+)\d*/.exec(
+        version_extension
+      ):
+        matches = /.*-(\d+\.\d+\.\d)(beta|alpha|devel|snapshot)\d*/.exec(
           version_extension
         ) as RegExpExecArray;
         add_script += await utils.joins(
           '\nAdd-Extension',
           ext_name,
-          matches[2].replace('preview', 'devel'),
+          matches[2],
           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');
@@ -200,10 +223,10 @@ export async function addExtensionWindows(
         add_script +=
           '\nAdd-Extension mysql\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
         break;
-      // match 7.0mysql..8.9mysql
+      // match 7.0mysql..8.0mysql
-      // match 7.0mysqli..8.9mysqli
+      // match 7.0mysqli..8.0mysqli
-      // match 7.0mysqlnd..8.9mysqlnd
+      // match 7.0mysqlnd..8.0mysqlnd
-      case /[7-8]\.\d+(mysql|mysqli|mysqlnd)$/.test(version_extension):
+      case /[7-8]\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
         add_script += '\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
         break;
       // match sqlite
@@ -224,54 +247,60 @@ export async function addExtensionWindows(
  *
  * @param extension_csv
  * @param version
+ * @param pipe
  */
 export async function addExtensionLinux(
   extension_csv: string,
-  version: string
+  version: string,
+  pipe: string
 ): Promise<string> {
-  const extensions: Array<string> = await utils.packageArray(extension_csv);
+  const extensions: Array<string> = await utils.extensionArray(extension_csv);
   let add_script = '\n';
   let remove_script = '';
   await utils.asyncForEach(extensions, async function (extension: string) {
     const version_extension: string = version + extension;
     const [ext_name, ext_version]: string[] = extension.split('-');
     const ext_prefix = await utils.getExtensionPrefix(ext_name);
-    let matches: RegExpExecArray;
+    const command_prefix = 'sudo $debconf_fix apt-get install -y php';
-
+    let command = '';
     switch (true) {
       // Match :extension
       case /^:/.test(ext_name):
         remove_script += '\nremove_extension ' + ext_name.slice(1);
         return;
-      // match 5.3blackfire...8.0blackfire
+      // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-      // match 5.3blackfire-(semver)...8.0blackfire-(semver)
+      // match 5.3blackfire-{semver}...5.6blackfire-{semver}, 7.0blackfire-{semver}...7.4blackfire-{semver}
-      // match 5.3pdo_cubrid...7.2php_cubrid, 5.3cubrid...7.4cubrid
+      case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
-      // match couchbase, pdo_oci, oci8, http, pecl_http
-      // match 5.3ioncube...7.4ioncube, 5.3geos...7.4geos
-      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
-      // match 5.6gearman...8.1gearman
-      case /^(5\.[3-6]|7\.[0-4]|8\.0)blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
-      case /^((5\.[3-6])|(7\.[0-2]))pdo_cubrid$|^((5\.[3-6])|(7\.[0-4]))cubrid$/.test(
+        add_script += await customExtension(
-        version_extension
+          'blackfire.sh',
-      ):
+          'add_blackfire',
-      case /^couchbase$|^pdo_oci$|^oci8$|^http|^pecl_http|^pdo_firebird$/.test(
+          extension
-        extension
-      ):
-      case /^(5\.6|7\.[0-4]|8\.0)intl-[\d]+\.[\d]+$/.test(version_extension):
-      case /^(5\.[3-6]|7\.[0-4])(ioncube|geos)$/.test(version_extension):
-      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-      case /^(5\.[3-6]|7\.[0-4]|8\.[0-9])gearman$/.test(version_extension):
-        add_script += await utils.customPackage(
-          ext_name,
-          'ext',
-          extension,
-          'linux'
         );
         return;
+      // match pdo_oci and oci8
+      case /^pdo_oci$|^oci8$/.test(extension):
+        add_script += await customExtension('oci.sh', 'add_oci', extension);
+        return;
+      // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
+      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
+        add_script += await customExtension('ioncube.sh', 'add_ioncube');
+        return;
+      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
+      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+        add_script += await customExtension(
+          'phalcon.sh',
+          'add_phalcon',
+          extension
+        );
+        return;
+      // match 5.6gearman..7.4gearman
+      case /^((5\.6)|(7\.[0-4]))gearman$/.test(version_extension):
+        add_script += await customExtension('gearman.sh', 'add_gearman');
+        return;
       // match pre-release versions. For example - xdebug-beta
-      case /.+-(stable|beta|alpha|devel|snapshot|rc|preview)/.test(extension):
+      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
         add_script += await utils.joins(
           '\nadd_unstable_extension',
           ext_name,
@@ -279,21 +308,8 @@ export async function addExtensionLinux(
           ext_prefix
         );
         return;
-      // match extensions from GitHub. Do this before checking for semver as
-      // the version may match that as well
-      case /.+-.+\/.+@.+/.test(extension):
-        matches = /.+-(.+)\/(.+)@(.+)/.exec(extension) as RegExpExecArray;
-        add_script += await utils.joins(
-          '\nadd_extension_from_github',
-          ext_name,
-          matches[1],
-          matches[2],
-          matches[3],
-          ext_prefix
-        );
-        return;
       // match semver versions
-      case /.+-\d+\.\d+\.\d+.*/.test(extension):
+      case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
         add_script += await utils.joins(
           '\nadd_pecl_extension',
           ext_name,
@@ -305,28 +321,40 @@ 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.2xdebug2...7.4xdebug2
+      // match 7.2xdebug3..7.4xdebug3
-      case /^7\.[2-4]xdebug2$/.test(version_extension):
+      case /^7\.[2-4]xdebug3$/.test(version_extension):
-        add_script += await utils.joins(
+        add_script +=
-          '\nadd_pecl_extension',
+          '\nadd_extension_from_source xdebug xdebug/xdebug master --enable-xdebug zend_extension';
-          'xdebug',
-          '2.9.8',
-          ext_prefix
-        );
         return;
+      // match 8.0xdebug3
+      case /^8\.[0-9]xdebug3$/.test(version_extension):
+        extension = 'xdebug';
+        command = command_prefix + version + '-' + extension + pipe;
+        break;
       // match pdo extensions
-      case /^pdo[_-].+/.test(extension):
+      case /.*pdo[_-].*/.test(version_extension):
         extension = extension.replace(/pdo[_-]|3/, '');
         add_script += '\nadd_pdo_extension ' + extension;
         return;
+      // match ast and uopz
+      case /^(ast|uopz)$/.test(extension):
+        command = command_prefix + '-' + extension + pipe;
+        break;
       // match sqlite
       case /^sqlite$/.test(extension):
         extension = 'sqlite3';
+        command = command_prefix + version + '-' + extension + pipe;
         break;
       default:
+        command = command_prefix + version + '-' + extension + pipe;
         break;
     }
-    add_script += await utils.joins('\nadd_extension', extension, ext_prefix);
+    add_script += await utils.joins(
+      '\nadd_extension',
+      extension,
+      '"' + command + '"',
+      ext_prefix
+    );
   });
   return add_script + remove_script;
 }
@@ -345,15 +373,15 @@ export async function addExtension(
   os_version: string,
   no_step = false
 ): Promise<string> {
-  const log: string = await utils.stepLog('Setup Extensions', os_version);
+  const pipe: string = await utils.suppressOutput(os_version);
   let script = '\n';
   switch (no_step) {
     case true:
-      script += log + (await utils.suppressOutput(os_version));
+      script += (await utils.stepLog('Setup Extensions', os_version)) + pipe;
       break;
     case false:
     default:
-      script += log;
+      script += await utils.stepLog('Setup Extensions', os_version);
       break;
   }
 
@@ -361,9 +389,9 @@ export async function addExtension(
     case 'win32':
       return script + (await addExtensionWindows(extension_csv, version));
     case 'darwin':
-      return script + (await addExtensionDarwin(extension_csv, version));
+      return script + (await addExtensionDarwin(extension_csv, version, pipe));
     case 'linux':
-      return script + (await addExtensionLinux(extension_csv, version));
+      return script + (await addExtensionLinux(extension_csv, version, pipe));
     default:
       return await utils.log(
         'Platform ' + os_version + ' is not supported',

src/install.ts

@@ -1,11 +1,11 @@
-import {exec} from '@actions/exec';
+import {exec} from '@actions/exec/lib/exec';
 import * as core from '@actions/core';
 import * as config from './config';
 import * as coverage from './coverage';
 import * as extensions from './extensions';
-import * as sapi from './sapi';
 import * as tools from './tools';
 import * as utils from './utils';
+import * as matchers from './matchers';
 
 /**
  * Build the script
@@ -14,26 +14,30 @@ import * as utils from './utils';
  * @param version
  * @param os_version
  */
-export async function getScript(
+export async function build(
   filename: string,
   version: string,
   os_version: string
 ): Promise<string> {
-  const name = 'setup-php';
-  const url = 'https://setup-php.com/support';
   // taking inputs
-  process.env['fail_fast'] = await utils.getInput('fail-fast', false);
+  const extension_csv: string =
-  const extension_csv: string = await utils.getInput('extensions', false);
+    (await utils.getInput('extensions', false)) ||
+    (await utils.getInput('extension', false));
   const ini_values_csv: string = await utils.getInput('ini-values', false);
   const coverage_driver: string = await utils.getInput('coverage', false);
-  const tools_csv: string = await utils.getInput('tools', false);
+  const pecl: string = await utils.getInput('pecl', false);
-  const sapi_csv: string = await utils.getInput('sapi', false);
+  let tools_csv: string = await utils.getInput('tools', false);
+  if (
+    pecl == 'true' ||
+    /.*-(beta|alpha|devel|snapshot).*/.test(extension_csv) ||
+    /.*-(\d+\.\d+\.\d+).*/.test(extension_csv)
+  ) {
+    tools_csv = 'pecl, ' + tools_csv;
+  }
 
   let script: string = await utils.readScript(filename);
-  if (sapi_csv) {
-    script += await sapi.addSAPI(sapi_csv, os_version);
-  }
   script += await tools.addTools(tools_csv, version, os_version);
+
   if (extension_csv) {
     script += await extensions.addExtension(extension_csv, version, os_version);
   }
@@ -44,9 +48,6 @@ export async function getScript(
     script += await config.addINIValues(ini_values_csv, os_version);
   }
 
-  script += '\n' + (await utils.stepLog('Support this project', os_version));
-  script += '\n' + (await utils.addLog('$tick', name, url, os_version));
-
   return await utils.writeScript(filename, script);
 }
 
@@ -55,26 +56,28 @@ export async function getScript(
  */
 export async function run(): Promise<void> {
   try {
-    const version: string = await utils.parseVersion(
+    let version: string = await utils.getInput('php-version', true);
-      await utils.getInput('php-version', true)
+    version = version.length > 1 ? version.slice(0, 3) : version + '.0';
-    );
+    const os_version: string = process.platform;
-    if (version) {
+
-      const os_version: string = process.platform;
+    // check the os version and run the respective script
-      const tool = await utils.scriptTool(os_version);
+    let script_path = '';
-      const script = os_version + (await utils.scriptExtension(os_version));
+    switch (os_version) {
-      const location = await getScript(script, version, os_version);
+      case 'darwin':
-      await exec(await utils.joins(tool, location, version, __dirname));
+      case 'linux':
-    } else {
+        script_path = await build(os_version + '.sh', version, os_version);
-      core.setFailed('Unable to get the PHP version');
+        await exec('bash ' + script_path + ' ' + version + ' ' + __dirname);
+        break;
+      case 'win32':
+        script_path = await build('win32.ps1', version, os_version);
+        await exec('pwsh ' + script_path + ' ' + version + ' ' + __dirname);
+        break;
     }
+    await matchers.addMatchers();
   } catch (error) {
     core.setFailed(error.message);
   }
 }
 
 // call the run function
-(async () => {
+run();
-  await run();
-})().catch(error => {
-  core.setFailed(error.message);
-});

src/matchers.ts

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

src/sapi.ts

@@ -1,51 +0,0 @@
-import * as utils from './utils';
-
-export async function getSapiList(sapi_csv: string): Promise<Array<string>> {
-  const sapi_list: Array<string> = await utils.packageArray(sapi_csv);
-  const servers: Array<string> = sapi_list.filter(sapi => /.*:.*/.test(sapi));
-  return [servers[servers.length - 1]].concat(
-    sapi_list.filter(sapi => /.*[^:].*/.test(sapi))
-  );
-}
-
-/**
- * Function to set sapi
- *
- * @param sapi_csv
- * @param os_version
- */
-export async function addSAPI(
-  sapi_csv: string,
-  os_version: string
-): Promise<string> {
-  let script: string = '\n' + (await utils.stepLog('Setup SAPI', os_version));
-  let sapi_list: Array<string>;
-  switch (true) {
-    case sapi_csv.split(':').length - 1 > 1:
-      sapi_list = await getSapiList(sapi_csv);
-      script +=
-        '\n' +
-        utils.log(
-          'Multiple SAPI with web servers specified, choosing the last one ' +
-            sapi_list[0],
-          os_version,
-          'warning'
-        );
-      break;
-    default:
-      sapi_list = await utils.packageArray(sapi_csv);
-  }
-  await utils.asyncForEach(sapi_list, async function (sapi: string) {
-    sapi = sapi.toLowerCase();
-    switch (os_version) {
-      case 'linux':
-      case 'darwin':
-        script += '\nadd_sapi ' + sapi;
-        break;
-      case 'win32':
-        script += '\nAdd-Sapi ' + sapi;
-        break;
-    }
-  });
-  return script;
-}

src/scripts/common.sh

@@ -1,294 +0,0 @@
-# Variables
-export tick="✓"
-export cross="✗"
-export curl_opts=(-sL)
-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"
-
-# Function to log start of a operation.
-step_log() {
-  message=$1
-  printf "\n\033[90;1m==> \033[0m\033[37;1m%s\033[0m\n" "$message"
-}
-
-# Function to log result of a operation.
-add_log() {
-  mark=$1
-  subject=$2
-  message=$3
-  if [ "$mark" = "$tick" ]; then
-    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;
-  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"
-  ) || add_log "$cross" "$extension_name" "Could not install $extension on PHP ${semver:?}"
-}
-
-# Function to read env inputs.
-read_env() {
-  [[ -z "${update}" ]] && update='false' && UPDATE='false' || update="${update}"
-  [ "$update" = false ] && [[ -n ${UPDATE} ]] && update="${UPDATE}"
-  [[ -z "${runner}" ]] && runner='github' && RUNNER='github' || runner="${runner}"
-  [ "$runner" = false ] && [[ -n ${RUNNER} ]] && runner="${RUNNER}"
-  [[ -z "${fail_fast}" ]] && fail_fast='false' || fail_fast="${fail_fast}"
-}
-
-# Function to download a file using cURL.
-# mode: -s pipe to stdout, -v save file and return status code
-# execute: -e save file as executable
-get() {
-  mode=$1
-  execute=$2
-  file_path=$3
-  shift 3
-  links=("$@")
-  if [ "$mode" = "-s" ]; then
-    sudo curl "${curl_opts[@]}" "${links[0]}"
-  else
-    for link in "${links[@]}"; do
-      status_code=$(sudo curl -w "%{http_code}" -o "$file_path" "${curl_opts[@]}" "$link")
-      [ "$status_code" = "200" ] && break
-    done
-    [ "$execute" = "-e" ] && sudo chmod a+x "$file_path"
-    [ "$mode" = "-v" ] && echo "$status_code"
-  fi
-}
-
-# Function to download and run scripts from GitHub releases with bintray fallback.
-run_script() {
-  repo=$1
-  shift
-  args=("$@")
-  get -q -e /tmp/install.sh "$github/$repo/$latest/install.sh" "$bintray/php/$repo.sh"
-  bash /tmp/install.sh "${args[@]}"
-}
-
-# Function to install required packages on self-hosted runners.
-self_hosted_setup() {
-  if [ "$runner" = "self-hosted" ]; then
-    if [[ "${version:?}" =~ $old_versions ]]; then
-      add_log "$cross" "PHP" "PHP $version is not supported on self-hosted runner"
-      exit 1
-    else
-      self_hosted_helper >/dev/null 2>&1
-    fi
-  fi
-}
-
-# Function to test if extension is loaded.
-check_extension() {
-  extension=$1
-  if [ "$extension" != "mysql" ]; then
-    php -m | grep -i -q -w "$extension"
-  else
-    php -m | grep -i -q "$extension"
-  fi
-}
-
-# Function to enable existing extensions.
-enable_extension() {
-  if [ -e /tmp/setup_php_dismod ] && grep -q "$1" /tmp/setup_php_dismod; then
-    sudo phpenmod -v "$version" "$1" >/dev/null 2>&1
-  fi
-  if ! check_extension "$1" && [ -e "${ext_dir:?}/$1.so" ]; then
-    echo "$2=${ext_dir:?}/$1.so" | sudo tee -a "${pecl_file:-${ini_file[@]}}" >/dev/null
-  fi
-}
-
-# 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 ]; then
-    if ! command -v pecl >/dev/null || ! command -v pear >/dev/null; then
-      add_pecl >/dev/null 2>&1
-    fi
-    for script in pear pecl; do
-      sudo "$script" config-set php_ini "${pecl_file:-${ini_file[@]}}"
-      sudo "$script" channel-update "$script".php.net
-    done
-    echo '' | sudo tee /tmp/pecl_config >/dev/null 2>&1
-  fi
-}
-
-# Function to get the PECL version of an extension.
-get_pecl_version() {
-  extension=$1
-  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 -Eio "([0-9]+\.[0-9]+\.[0-9]+${stability}[0-9]+)")
-  if [ ! "$pecl_version" ]; then
-    pecl_version=$(echo "$response" | grep -m 1 -Eo "([0-9]+\.[0-9]+\.[0-9]+)")
-  fi
-  echo "$pecl_version"
-}
-
-# Function to install PECL extensions and accept default options
-pecl_install() {
-  local extension=$1
-  configure_pecl >/dev/null 2>&1
-  yes '' 2>/dev/null | sudo pecl install -f "$extension" >/dev/null 2>&1
-}
-
-# Function to setup pre-release extensions using PECL.
-add_unstable_extension() {
-  extension=$1
-  stability=$2
-  prefix=$3
-  pecl_version=$(get_pecl_version "$extension" "$stability")
-  add_pecl_extension "$extension" "$pecl_version" "$prefix"
-}
-
-# Function to extract tool version.
-get_tool_version() {
-  tool=$1
-  param=$2
-  version_regex="[0-9]+((\.{1}[0-9]+)+)(\.{0})(-[a-zA-Z0-9]+){0,1}"
-  if [ "$tool" = "composer" ]; then
-    if [ "$param" != "snapshot" ]; then
-      composer_version="$(grep -Ea "const\sVERSION" "$tool_path_dir/composer" | grep -Eo "$version_regex")"
-    else
-      composer_version="$(grep -Ea "const\sBRANCH_ALIAS_VERSION" "$tool_path_dir/composer" | grep -Eo "$version_regex")+$(grep -Ea "const\sVERSION" "$tool_path_dir/composer" | grep -Eo "[a-zA-z0-9]+" | tail -n 1)"
-    fi
-    echo "$composer_version" | sudo tee /tmp/composer_version
-  else
-    $tool "$param" 2>/dev/null | sed -Ee "s/[Cc]omposer(.)?$version_regex//g" | grep -Eo "$version_regex" | head -n 1
-  fi
-}
-
-# Function to configure composer
-configure_composer() {
-  tool_path=$1
-  sudo ln -sf "$tool_path" "$tool_path.phar"
-  php -r "try {\$p=new Phar('$tool_path.phar', 0);exit(0);} catch(Exception \$e) {exit(1);}"
-  if [ $? -eq 1 ]; then
-    add_log "$cross" "composer" "Could not download composer"
-    exit 1
-  fi
-  if ! [ -e "$composer_json" ]; then
-    echo '{}' | tee "$composer_json" >/dev/null 2>&1
-    sudo chmod 644 "$composer_json"
-  fi
-  composer -q config -g process-timeout 0
-  echo "$composer_bin" >> "$GITHUB_PATH"
-  if [ -n "$COMPOSER_TOKEN" ]; then
-    composer -q config -g github-oauth.github.com "$COMPOSER_TOKEN"
-  fi
-}
-
-# Function to setup a remote tool.
-add_tool() {
-  url=$1
-  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
-  IFS="," read -r -a url <<< "$url"
-  status_code=$(get -v -e "$tool_path" "${url[@]}")
-  if [ "$status_code" != "200" ] && [[ "${url[0]}" =~ .*github.com.*releases.*latest.* ]]; then
-    url[0]="${url[0]//releases\/latest\/download/releases/download/$(get -s -n "" "$(echo "${url[0]}" | cut -d '/' -f '1-5')/releases" | grep -Eo -m 1 "([0-9]+\.[0-9]+\.[0-9]+)/$(echo "${url[0]}" | sed -e "s/.*\///")" | cut -d '/' -f 1)}"
-    status_code=$(get -v -e "$tool_path" "${url[0]}")
-  fi
-  if [ "$status_code" = "200" ]; then
-    add_tools_helper "$tool"
-    tool_version=$(get_tool_version "$tool" "$ver_param")
-    add_log "$tick" "$tool" "Added $tool $tool_version"
-  else
-    add_log "$cross" "$tool" "Could not setup $tool"
-  fi
-}
-
-# Function to setup a tool using composer.
-add_composertool() {
-  tool=$1
-  release=$2
-  prefix=$3
-  if [[ "$tool" =~ prestissimo|composer-prefetcher ]]; then
-    composer_version=$(cat /tmp/composer_version)
-    if [ "$(echo "$composer_version" | cut -d'.' -f 1)" != "1" ]; then
-      echo "::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
-    fi
-  fi
-  (
-    sudo rm -f "$composer_lock" >/dev/null 2>&1 || true
-    composer global require "$prefix$release" >/dev/null 2>&1
-    json=$(grep "$prefix$tool" "$composer_json") &&
-    tool_version=$(get_tool_version 'echo' "$json") &&
-    add_log "$tick" "$tool" "Added $tool $tool_version"
-  ) || add_log "$cross" "$tool" "Could not setup $tool"
-  add_tools_helper "$tool"
-  if [ -e "$composer_bin/composer" ]; then
-    sudo cp -p "$tool_path_dir/composer" "$composer_bin"
-  fi
-}
-
-# Function to get versions of PHP binaries in semver format.
-php_semver() {
-  binary=${1:-"php$version"}
-  arg=${2:-'-v'}
-  "$binary" "$arg" | grep -Eo -m 1 "[0-9]+\.[0-9]+\.[0-9]+" | head -n 1
-}
-
-# Function to get the tag for a php version.
-php_src_tag() {
-  php_src_tag='master'
-  if ! [[ ${version:?} =~ $nightly_versions ]]; then
-    php_src_tag="php-$semver"
-  fi
-  echo "$php_src_tag"
-}
-
-# Function to install extension from a GitHub repository
-add_extension_from_github() {
-  extension=$1
-  org=$2
-  repo=$3
-  release=$4
-  prefix=$5
-  (
-    add_devtools phpize
-    delete_extension "$extension"
-    git clone -n https://github.com/"$org"/"$repo" /tmp/"$repo-$release" || exit 1
-    cd /tmp/"$repo-$release" || exit 1
-    git checkout "$release" || exit 1
-    git submodule update --init --recursive || exit 1
-    phpize && ./configure && make -j"$(nproc)" && sudo make install
-    enable_extension "$extension" "$prefix"
-  ) >/dev/null 2>&1
-  add_extension_log "$extension-$org/$repo@$release" "Installed and enabled"
-}

src/scripts/darwin.sh

@@ -1,9 +1,45 @@
+# Function to log start of a operation.
+step_log() {
+  message=$1
+  printf "\n\033[90;1m==> \033[0m\033[37;1m%s\033[0m\n" "$message"
+}
+
+# Function to log result of a operation.
+add_log() {
+  mark=$1
+  subject=$2
+  message=$3
+  if [ "$mark" = "$tick" ]; then
+    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"
+  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"
+  ) || add_log "$cross" "$extension_name" "Could not install $extension on PHP $semver"
+}
+
+# Function to read env inputs.
+read_env() {
+  [[ -z "${update}" ]] && update='false' && UPDATE='false' || update="${update}"
+  [ "$update" = false ] && [[ -n ${UPDATE} ]] && update="${UPDATE}"
+  [[ -z "${runner}" ]] && runner='github' && RUNNER='github' || runner="${runner}"
+  [ "$runner" = false ] && [[ -n ${RUNNER} ]] && runner="${RUNNER}"
+}
+
 # Function to setup environment for self-hosted runners.
-self_hosted_helper() {
+self_hosted_setup() {
-  if ! command -v brew >/dev/null; then
+  if [[ $(command -v brew) == "" ]]; then
     step_log "Setup Brew"
-    get -q -e "/tmp/install.sh" "https://raw.githubusercontent.com/Homebrew/install/master/install.sh" && /tmp/install.sh >/dev/null 2>&1
+    curl "${curl_opts[@]}" https://raw.githubusercontent.com/Homebrew/install/master/install.sh | bash -s >/dev/null 2>&1
-    add_log "${tick:?}" "Brew" "Installed Homebrew"
+    add_log "$tick" "Brew" "Installed Homebrew"
   fi
 }
 
@@ -11,27 +47,59 @@ self_hosted_helper() {
 remove_extension() {
   extension=$1
   if check_extension "$extension"; then
-    sudo sed -Ei '' "/=(.*\/)?\"?$extension(.so)?$/d" "${ini_file:?}"
+    sudo sed -i '' "/$extension/d" "$ini_file"
-    sudo rm -rf "${scan_dir:?}"/*"$extension"* "${ext_dir:?}"/"$extension".so >/dev/null 2>&1
+    sudo rm -rf "$scan_dir"/*"$extension"* >/dev/null 2>&1
-    (! check_extension "$extension" && add_log "${tick:?}" ":$extension" "Removed") ||
+    sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1
-      add_log "${cross:?}" ":$extension" "Could not remove $extension on PHP ${semver:?}"
+    (! check_extension "$extension" && add_log "$tick" ":$extension" "Removed") ||
+      add_log "$cross" ":$extension" "Could not remove $extension on PHP $semver"
   else
-    add_log "${tick:?}" ":$extension" "Could not find $extension on PHP $semver"
+    add_log "$tick" ":$extension" "Could not find $extension on PHP $semver"
   fi
 }
 
+# Function to test if extension is loaded.
+check_extension() {
+  extension=$1
+  if [ "$extension" != "mysql" ]; then
+    php -m | grep -i -q -w "$extension"
+  else
+    php -m | grep -i -q "$extension"
+  fi
+}
+
+# Fuction to get the PECL version.
+get_pecl_version() {
+  extension=$1
+  stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot)")"
+  pecl_rest='https://pecl.php.net/rest/r/'
+  response=$(curl "${curl_opts[@]}" "$pecl_rest$extension"/allreleases.xml)
+  pecl_version=$(echo "$response" | grep -m 1 -Eio "(\d*\.\d*\.\d*$stability\d*)")
+  if [ ! "$pecl_version" ]; then
+    pecl_version=$(echo "$response" | grep -m 1 -Eo "(\d*\.\d*\.\d*)")
+  fi
+  echo "$pecl_version"
+}
+
+# Function to install PECL extensions and accept default options
+pecl_install() {
+  local extension=$1
+  yes '' | 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).* ]]; then
-  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot|preview).* ]]; then
     pecl_version=$(get_pecl_version "$extension" "$pecl_version")
   fi
+  if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
+    echo "$prefix=$ext_dir/$extension.so" >>"$ini_file"
+  fi
   ext_version=$(php -r "echo phpversion('$extension');")
   if [ "$ext_version" = "$pecl_version" ]; then
-    add_log "${tick:?}" "$extension" "Enabled"
+    add_log "$tick" "$extension" "Enabled"
   else
     remove_extension "$extension" >/dev/null 2>&1
     pecl_install "$extension-$pecl_version"
@@ -39,162 +107,173 @@ add_pecl_extension() {
   fi
 }
 
-# Function to fetch a brew tap
-fetch_brew_tap() {
-  tap=$1
-  tap_user=$(dirname "$tap")
-  tap_name=$(basename "$tap")
-  mkdir -p "$tap_dir/$tap_user"
-  get -s -n "" "https://github.com/$tap/archive/master.tar.gz" | sudo tar -xzf - -C "$tap_dir/$tap_user"
-  if [ -d "$tap_dir/$tap_user/$tap_name-master" ]; then
-    sudo mv "$tap_dir/$tap_user/$tap_name-master" "$tap_dir/$tap_user/$tap_name"
-  fi
-}
-
-# Function to add a brew tap.
-add_brew_tap() {
-  tap=$1
-  if ! [ -d "$tap_dir/$tap" ]; then
-    if [ "${runner:?}" = "self-hosted" ]; then
-      brew tap --shallow "$tap" >/dev/null 2>&1
-    else
-      fetch_brew_tap "$tap" >/dev/null 2>&1
-      if ! [ -d "$tap_dir/$tap" ]; then
-        brew tap --shallow "$tap" >/dev/null 2>&1
-      fi
-    fi
-  fi
-}
-
 # Function to install a php extension from shivammathur/extensions tap.
 add_brew_extension() {
-  formula=$1
+  extension=$1
-  prefix=$2
+  if ! brew tap | grep shivammathur/extensions; then
-  extension="$(echo "$formula" | sed -E "s/pecl_|[0-9]//g")"
+    brew tap --shallow shivammathur/extensions
-  enable_extension "$extension" "$prefix"
-  if check_extension "$extension"; then
-    add_log "${tick:?}" "$extension" "Enabled"
-  else
-    add_brew_tap shivammathur/homebrew-php
-    add_brew_tap shivammathur/homebrew-extensions
-    sudo mv "$tap_dir"/shivammathur/homebrew-extensions/.github/deps/"$formula"/* "$tap_dir/homebrew/homebrew-core/Formula/" 2>/dev/null || true
-    brew install "$formula@$version" >/dev/null 2>&1
-    sudo cp "$brew_prefix/opt/$formula@$version/$extension.so" "$ext_dir"
-    add_extension_log "$extension" "Installed and enabled"
   fi
+  brew install "$extension@$version"
+  sudo cp "$(brew --prefix)/opt/$extension@$version/$extension.so" "$ext_dir"
 }
 
 # Function to setup extensions
 add_extension() {
   extension=$1
-  prefix=$2
+  install_command=$2
-  enable_extension "$extension" "$prefix"
+  prefix=$3
-  if check_extension "$extension"; then
+  if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
-    add_log "${tick:?}" "$extension" "Enabled"
+    echo "$prefix=$ext_dir/$extension.so" >>"$ini_file" && add_log "$tick" "$extension" "Enabled"
-  else
+  elif check_extension "$extension"; then
-    [[ "$version" =~ 5.[4-5] ]] && [ "$extension" = "imagick" ] && brew install pkg-config imagemagick >/dev/null 2>&1
+    add_log "$tick" "$extension" "Enabled"
-    pecl_install "$extension" >/dev/null 2>&1 &&
+  elif ! check_extension "$extension"; then
-      if [[ "$version" =~ ${old_versions:?} ]]; then echo "$prefix=$ext_dir/$extension.so" >>"$ini_file"; fi
+    eval "$install_command" >/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"
   fi
 }
 
-# Function to handle request to add phpize and php-config.
+# Function to setup pre-release extensions using PECL.
-add_devtools() {
+add_unstable_extension() {
+  extension=$1
+  stability=$2
+  prefix=$3
+  pecl_version=$(get_pecl_version "$extension" "$stability")
+  add_pecl_extension "$extension" "$pecl_version" "$prefix"
+}
+
+# Function to configure composer
+configure_composer() {
+  tool_path=$1
+  sudo ln -sf "$tool_path" "$tool_path.phar"
+  php -r "try {\$p=new Phar('$tool_path.phar', 0);exit(0);} catch(Exception \$e) {exit(1);}"
+  if [ $? -eq 1 ]; then
+    add_log "$cross" "composer" "Could not download composer"
+    exit 1
+  fi
+  composer -q global config process-timeout 0
+  echo "::add-path::/Users/$USER/.composer/vendor/bin"
+  if [ -n "$COMPOSER_TOKEN" ]; then
+    composer -q global config github-oauth.github.com "$COMPOSER_TOKEN"
+  fi
+}
+
+# Function to setup a remote tool.
+add_tool() {
+  url=$1
+  tool=$2
+  tool_path="$tool_path_dir/$tool"
+  if [ ! -e "$tool_path" ]; then
+    rm -rf "$tool_path"
+  fi
+
+  if [ "$tool" = "composer" ]; then
+    IFS="," read -r -a urls <<< "$url"
+    status_code=$(sudo curl -s -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "${urls[0]}") ||
+    status_code=$(sudo curl -s -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "${urls[1]}")
+  else
+    status_code=$(sudo curl -s -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "$url")
+  fi
+  if [ "$status_code" = "200" ]; then
+    sudo chmod a+x "$tool_path"
+    if [ "$tool" = "composer" ]; then
+      configure_composer "$tool_path"
+    elif [ "$tool" = "phan" ]; then
+      add_extension fileinfo "pecl_install fileinfo" extension >/dev/null 2>&1
+      add_extension ast "pecl_install ast" extension >/dev/null 2>&1
+    elif [ "$tool" = "phive" ]; then
+      add_extension curl "pecl_install curl" extension >/dev/null 2>&1
+      add_extension mbstring "pecl_install mbstring" extension >/dev/null 2>&1
+      add_extension xml "pecl_install xml" extension >/dev/null 2>&1
+    elif [ "$tool" = "cs2pr" ]; then
+      sudo sed -i '' 's/exit(9)/exit(0)/' "$tool_path"
+      tr -d '\r' <"$tool_path" | sudo tee "$tool_path.tmp" >/dev/null 2>&1 && sudo mv "$tool_path.tmp" "$tool_path"
+      sudo chmod a+x "$tool_path"
+    elif [ "$tool" = "wp-cli" ]; then
+      sudo cp -p "$tool_path" "$tool_path_dir"/wp
+    fi
+    add_log "$tick" "$tool" "Added"
+  else
+    add_log "$cross" "$tool" "Could not setup $tool"
+  fi
+}
+
+# Function to add a tool using composer.
+add_composertool() {
   tool=$1
-  add_log "${tick:?}" "$tool" "Added $tool $semver"
+  release=$2
+  prefix=$3
+  (
+    composer global require "$prefix$release" >/dev/null 2>&1 && add_log "$tick" "$tool" "Added"
+  ) || add_log "$cross" "$tool" "Could not setup $tool"
+}
+
+# Function to configure PECL
+configure_pecl() {
+  for tool in pear pecl; do
+    sudo "$tool" config-set php_ini "$ini_file"
+    sudo "$tool" channel-update "$tool".php.net
+  done
 }
 
 # Function to handle request to add PECL.
 add_pecl() {
-  pecl_version=$(get_tool_version "pecl" "version")
+  add_log "$tick" "PECL" "Added"
-  add_log "${tick:?}" "PECL" "Found PECL $pecl_version"
 }
 
-# Function to link all libraries of a formula
+# Function to setup PHP 5.6 and newer.
-link_libraries() {
-  formula=$1
-  formula_prefix="$(brew --prefix "$formula")"
-  sudo mkdir -p "$formula_prefix"/lib
-  sudo cp -a "$formula_prefix"/lib/*.dylib "$brew_prefix/lib" 2>/dev/null || true
-}
-
-update_dependencies_helper() {
-  formula=$1
-  get -q -n "$tap_dir/homebrew/homebrew-core/Formula/$formula.rb" "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/$formula.rb"
-  link_libraries "$formula"
-}
-
-# Function to update dependencies.
-update_dependencies() {
-  if [ "${runner:?}" != "self-hosted" ] && [ "${ImageOS:-}" != "" ] && [ "${ImageVersion:-}" != "" ]; then
-    while read -r formula; do
-      update_dependencies_helper "$formula" &
-      to_wait+=($!)
-    done <"$tap_dir/shivammathur/homebrew-php/.github/deps/${ImageOS:?}_${ImageVersion:?}"
-    wait "${to_wait[@]}"
-  fi
-}
-
-# Function to setup PHP 5.6 and newer using Homebrew.
-add_php() {
-  action=$1
-  add_brew_tap shivammathur/homebrew-php
-  update_dependencies
-  if ! [[ "$(find "$(brew --cellar)"/php/ -maxdepth 1 -name "$version*" | wc -l 2>/dev/null)" -eq 0 ]] && [ "$action" != "upgrade" ]; then
-    brew unlink shivammathur/php/php@"$version"
-  else
-    brew upgrade "shivammathur/php/php@$version" 2>/dev/null || brew install "shivammathur/php/php@$version"
-  fi
-  brew link --force --overwrite shivammathur/php/php@"$version"
-}
-
-# Function to Setup PHP
 setup_php() {
-  step_log "Setup PHP"
+  action=$1
-  existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
+  export HOMEBREW_NO_INSTALL_CLEANUP=TRUE
-  if [[ "$version" =~ ${old_versions:?} ]]; then
+  brew tap --shallow shivammathur/homebrew-php
-    run_script "php5-darwin" "${version/./}" >/dev/null 2>&1
+  if brew list php@"$version" 2>/dev/null | grep -q "Error" && [ "$action" != "upgrade" ]; then
-    status="Installed"
+    brew unlink php@"$version"
-  elif [ "$existing_version" != "$version" ]; then
-    add_php "install" >/dev/null 2>&1
-    status="Installed"
-  elif [ "$existing_version" = "$version" ] && [ "${update:?}" = "true" ]; then
-    add_php "upgrade" >/dev/null 2>&1
-    status="Updated to"
   else
-    status="Found"
+    brew "$action" shivammathur/php/php@"$version"
   fi
-  ini_file=$(php -d "date.timezone=UTC" --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
+  brew link --force --overwrite php@"$version"
-  sudo chmod 777 "$ini_file" "${tool_path_dir:?}"
-  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 [ "${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"
 }
 
 # Variables
+tick="✓"
+cross="✗"
 version=$1
-dist=$2
+nodot_version=${1/./}
-brew_prefix="$(brew --prefix)"
+old_versions="5.[3-5]"
-brew_repo="$(brew --repository)"
+tool_path_dir="/usr/local/bin"
-tap_dir="$brew_repo"/Library/Taps
+curl_opts=(-sL)
-scripts="${dist}"/../src/scripts
+existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
-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=.
-. "${scripts:?}"/tools/add_tools.sh
-. "${scripts:?}"/common.sh
 read_env
-self_hosted_setup
+if [ "$runner" = "self-hosted" ]; then
-setup_php
+  if [[ "$version" =~ $old_versions ]]; then
+    add_log "$cross" "PHP" "PHP $version is not supported on self-hosted runner"
+    exit 1
+  else
+    self_hosted_setup >/dev/null 2>&1
+  fi
+fi
+
+# Setup PHP
+step_log "Setup PHP"
+if [[ "$version" =~ $old_versions ]]; then
+  curl "${curl_opts[@]}" https://github.com/shivammathur/php5-darwin/releases/latest/download/install.sh | bash -s "$nodot_version" >/dev/null 2>&1
+  status="Installed"
+elif [ "$existing_version" != "$version" ]; then
+  setup_php "install" >/dev/null 2>&1
+  status="Installed"
+elif [ "$existing_version" = "$version" ] && [ "$update" = "true" ]; then
+  setup_php "upgrade" >/dev/null 2>&1
+  status="Updated to"
+else
+  status="Found"
+fi
+ini_file=$(php -d "date.timezone=UTC" --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
+sudo chmod 777 "$ini_file" "$tool_path_dir"
+echo -e "date.timezone=UTC\nmemory_limit=-1" >>"$ini_file"
+ext_dir=$(php -i | grep -Ei "extension_dir => /" | sed -e "s|.*=> s*||")
+scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
+sudo mkdir -p "$ext_dir"
+semver=$(php -v | head -n 1 | cut -f 2 -d ' ')
+if [[ ! "$version" =~ $old_versions ]]; then configure_pecl >/dev/null 2>&1; fi
+add_log "$tick" "PHP" "$status PHP $semver"

src/scripts/ext/blackfire.ps1

@@ -17,7 +17,7 @@ Function Add-Blackfire() {
         $status="Enabled"
     } else {
         $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
-        Invoke-WebRequest -Uri "https://packages.blackfire.io/binaries/blackfire-php/${extension_version}/blackfire-php-windows_${arch}-php-${no_dot_version}${nts}.dll" -OutFile $ext_dir\blackfire.dll > $null 2>&1
+        Invoke-WebRequest -UseBasicParsing -Uri "https://packages.blackfire.io/binaries/blackfire-php/${extension_version}/blackfire-php-windows_${arch}-php-${no_dot_version}${nts}.dll" -OutFile $ext_dir\blackfire.dll > $null 2>&1
         Enable-PhpExtension -Extension blackfire -Path $php_dir
         $status="Installed and enabled"
     }

src/scripts/ext/blackfire.sh

@@ -5,12 +5,12 @@ add_blackfire() {
   no_dot_version=${version/./}
   platform=$(uname -s | tr '[:upper:]' '[:lower:]')
   extension_version=$(echo "$extension" | cut -d '-' -f 2)
-  blackfire_ini_file="${pecl_file:-${ini_file[@]}}"
+  blackfire_ini_file="${scan_dir:?}/50-blackfire.ini"
   if [ ! -e "${ext_dir:?}/blackfire.so" ]; then
     if [ "$extension_version" = "blackfire" ]; then
-      extension_version=$(get -s -n "" https://blackfire.io/api/v1/releases | grep -Eo 'php":"([0-9]+.[0-9]+.[0-9]+)' | cut -d '"' -f 3)
+      extension_version=$(curl -sSL https://blackfire.io/api/v1/releases | grep -Eo 'php":"([0-9]+.[0-9]+.[0-9]+)' | cut -d '"' -f 3)
     fi
-    get -q -n "${ext_dir:?}/blackfire.so" https://packages.blackfire.io/binaries/blackfire-php/"$extension_version"/blackfire-php-"$platform"_amd64-php-"$no_dot_version".so >/dev/null 2>&1
+    sudo curl -o "${ext_dir:?}/blackfire.so" "${curl_opts[@]:?}" 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
   add_extension_log "$extension-$extension_version" "Installed and enabled"

src/scripts/ext/couchbase.sh

@@ -1,48 +0,0 @@
-# Function to install libraries required by couchbase
-add_couchbase_libs() {
-  if [ "$(uname -s)" = "Linux" ]; then
-    if [[ ${version:?} =~ 5.[3-6]|7.[0-1] ]]; then
-      release="2.10.9"
-      trunk="https://github.com/couchbase/libcouchbase/releases/download"
-      package="libcouchbase-${release}_ubuntu${DISTRIB_RELEASE/./}_${DISTRIB_CODENAME}_amd64.tar"
-      get -q -n /tmp/libcouchbase.tar "$trunk/$release/$package"
-      sudo tar -xf /tmp/libcouchbase.tar -C /tmp
-      install_packages libev4
-      sudo dpkg -i /tmp/libcouchbase-*/*.deb
-    else
-      trunk="http://packages.couchbase.com/clients/c/repos/deb"
-      list="deb $trunk/ubuntu${DISTRIB_RELEASE/./} ${DISTRIB_CODENAME:?} ${DISTRIB_CODENAME:?}/main"
-      get -s -n "" "$trunk/couchbase.key" | sudo apt-key add
-      echo "$list" | sudo tee /etc/apt/sources.list.d/couchbase.list
-      sudo apt-get update
-    fi
-    ${apt_install:?} libcouchbase-dev
-  else
-    if [[ ${version:?} =~ 5.[3-6]|7.[0-1] ]]; then
-      brew install libcouchbase@2
-      brew link --overwrite --force libcouchbase@2
-    else
-      brew install libcouchbase
-    fi
-  fi
-}
-
-# Function to add couchbase.
-add_couchbase() {
-  add_couchbase_libs >/dev/null 2>&1
-  enable_extension "couchbase" "extension"
-  if check_extension "couchbase"; then
-    add_log "${tick:?}" "couchbase" "Enabled"
-  else
-    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
-    add_extension_log "couchbase" "Installed and enabled"
-  fi
-}

src/scripts/ext/cubrid.sh

@@ -1,63 +0,0 @@
-# Function to log license details.
-add_license_log() {
-  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "$ext" "Click to read the $ext related license information"
-  printf "Cubrid CCI package is required for %s extension.\n" "$ext"
-  printf "The extension %s and Cubrid CCI are provided under the license linked below.\n" "$ext"
-  printf "Refer to: \033[35;1m%s \033[0m\n" "https://github.com/CUBRID/cubrid-cci/blob/develop/COPYING"
-  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
-    "cubrid") cubrid_repo="cubrid-php";;
-    "pdo_cubrid") cubrid_repo="cubrid-pdo";;
-  esac
-}
-
-# Function to set cubrid branch for a PHP version.
-set_cubrid_branch() {
-  case "${version:?}" in
-    5.[3-6]) cubrid_branch="RB-9.3.0";;
-    *) cubrid_branch="develop";;
-  esac
-}
-
-add_cubrid_helper() {
-  ext=$1
-  enable_extension "$ext" extension
-  if ! check_extension "$ext"; then
-    status='Installed and enabled'
-    set_cubrid_repo
-    set_cubrid_branch
-    [ "$DISTRIB_RELEASE" = "16.04" ] && setup_compiler
-    (
-      git clone -b "$cubrid_branch" --recursive "https://github.com/CUBRID/$cubrid_repo" "/tmp/$cubrid_repo"
-      cd "/tmp/$cubrid_repo" || exit
-      ! [[ "$version" =~ ${old_versions:?} ]] && add_devtools
-      phpize
-      sudo ./configure --with-php-config="$(command -v php-config)" --with-"${ext/_/-}"=shared
-      make -j"$(nproc)"
-      sudo make install
-    )
-    echo "extension=$ext.so" | sudo tee "${scan_dir:?}/$ext.ini"
-  fi
-}
-
-# Function to add cubrid and pdo_cubrid.
-add_cubrid() {
-  ext=$1
-  status='Enabled'
-  add_cubrid_helper "$ext" >/dev/null 2>&1
-  add_extension_log "$ext" "$status"
-  check_extension "$ext" && add_license_log
-}

src/scripts/ext/firebird.ps1

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

@@ -1,46 +0,0 @@
-add_firebird_client_darwin() {
-  pkg_name=$(get -s -n "" https://github.com/FirebirdSQL/firebird/releases/latest | grep -Eo "Firebird-.*.pkg" | head -n 1)
-  get -q -e "/tmp/firebird.pkg" https://github.com/FirebirdSQL/firebird/releases/latest/download/"$pkg_name"
-  sudo installer -pkg /tmp/firebird.pkg -target /
-  sudo mkdir -p /opt/firebird/include /opt/firebird/lib
-  sudo find /Library/Frameworks/Firebird.framework -name '*.h' -exec cp "{}" /opt/firebird/include \;
-  sudo find /Library/Frameworks/Firebird.framework -name '*.dylib' -exec cp "{}" /opt/firebird/lib \;
-}
-
-add_firebird_helper() {
-  firebird_dir=$1
-  tag="$(php_src_tag)"
-  get -s -n "" https://github.com/php/php-src/archive/"$tag".tar.gz | tar -xzf - -C /tmp
-  (
-    cd /tmp/php-src-"$tag"/ext/pdo_firebird || exit
-    if [[ "${version:?}" =~ ${old_versions:?} ]]; then
-      sudo sed -i '' '/PHP_CHECK_PDO_INCLUDES/d' config.m4 2>/dev/null || sudo sed -i '/PHP_CHECK_PDO_INCLUDES/d' config.m4
-    fi
-    sudo phpize
-    sudo ./configure --with-pdo-firebird="$firebird_dir"
-    sudo make -j"$(nproc 2>/dev/null || sysctl -n hw.ncpu)"
-    sudo make install
-    enable_extension pdo_firebird extension
-  )
-}
-
-add_firebird() {
-  enable_extension pdo_firebird
-  if ! check_extension pdo_firebird; then
-    if [ "$(uname -s)" = "Linux" ]; then
-      if [[ "${version:?}" =~ 5.3|${nightly_versions:?} ]]; then
-        lib_arch=$(gcc -dumpmachine)
-        install_packages firebird-dev >/dev/null 2>&1
-        sudo ln -sf /usr/lib/"$lib_arch"/libfbclient.so.2 /usr/lib/libfbclient.so >/dev/null 2>&1
-        sudo ln -sf /usr/lib/"$lib_arch"/libib_util.so /usr/lib/ >/dev/null 2>&1
-        add_firebird_helper /usr >/dev/null 2>&1
-      else
-        add_pdo_extension firebird >/dev/null 2>&1
-      fi
-    else
-      add_firebird_client_darwin >/dev/null 2>&1
-      add_firebird_helper /opt/firebird >/dev/null 2>&1
-    fi
-    add_extension_log pdo_firebird "Installed and enabled"
-  fi
-}

src/scripts/ext/gearman.sh

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

src/scripts/ext/geos.sh

@@ -1,51 +0,0 @@
-# Helper function install geos library and headers
-add_geos_libs() {
-  if [ "$(uname -s)" = "Darwin" ]; then
-    brew install geos
-  else
-    sudo apt-get install libgeos-dev
-    if [ "${runner:?}" = "self-hosted" ]; then
-      ${apt_install:?} --no-upgrade --no-install-recommends autoconf automake gcc g++
-    fi
-  fi
-}
-
-# Patch geos for PHP 7
-patch_geos() {
-  if [ "$(php -r "echo PHP_VERSION_ID;")" -ge 70000 ]; then
-    sed -i~ -e "s/, ce->name/, ZSTR_VAL(ce->name)/; s/ulong /zend_ulong /" /tmp/php-geos-"$geos_tag"/geos.c
-  fi
-}
-
-# Get geos source
-get_geos() {
-  curl -o /tmp/geos.tar.gz -sL https://github.com/libgeos/php-geos/archive/"$geos_tag".tar.gz
-  tar -xzf /tmp/geos.tar.gz -C /tmp
-  patch_geos
-}
-
-# Helper function to compile and install geos
-add_geos_helper() {
-  get_geos
-  (
-    cd /tmp/php-geos-"$geos_tag" || exit
-    phpize
-    ./configure --enable-geos --with-geos-config="$(command -v geos-config)"
-    sudo make -j"$(nproc)"
-    sudo make install
-    enable_extension geos extension
-  )
-}
-
-# Function to add geos
-add_geos() {
-  geos_tag='1.0.0'
-  add_geos_libs >/dev/null 2>&1
-  enable_extension "geos" "extension"
-  if check_extension "geos"; then
-    add_log "${tick:?}" "geos" "Enabled"
-  else
-    add_geos_helper >/dev/null 2>&1
-    add_extension_log "geos" "Installed and enabled"
-  fi
-}

src/scripts/ext/http.ps1

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

@@ -1,166 +0,0 @@
-# Function to get http version for a PHP version.
-get_http_version() {
-  if [[ ${version:?} =~ 5.[3-6] ]]; then
-    echo "pecl_http-2.6.0"
-  elif [[ ${version:?} =~ 7.[0-4] ]]; then
-    echo "pecl_http-3.2.4"
-  else
-    echo "pecl_http-$(get_pecl_version "pecl_http" "stable")"
-  fi
-}
-
-# Function to enable http extension.
-enable_http() {
-  enable_extension propro extension
-  enable_extension raphf extension
-  if (! [[ ${version:?} =~ ${jit_versions:?} ]] && check_extension propro && check_extension raphf) ||
-     ( [[ ${version:?} =~ ${jit_versions:?} ]] && check_extension raphf); then
-    enable_extension http extension
-  fi
-}
-
-# Function to install linux dependencies.
-add_http_dependencies_linux() {
-  ! [[ ${version:?} =~ ${nightly_versions:?} ]] && add_devtools phpize
-  install_packages zlib1g libbrotli-dev libcurl4-openssl-dev libevent-dev libicu-dev libidn2-dev
-  if [[ ${version:?} =~ ${old_versions:?} ]]; then
-    add_pecl_extension raphf 1.1.2 extension
-    add_pecl_extension propro 1.0.2 extension
-  elif [[ ${version:?} =~ 5.6|7.[0-4] ]]; then  
-    add_extension propro extension
-    add_extension raphf extension
-  else
-    add_extension raphf extension
-  fi
-}
-
-# Function to install darwin dependencies.
-add_http_dependencies_darwin() {
-  brew install brotli curl icu4c libevent libidn2
-  if ! [[ ${version:?} =~ ${old_versions:?} ]]; then
-    if [[ ${version:?} =~ 5.6|7.[0-4] ]]; then
-      add_brew_extension propro extension
-    fi
-    add_brew_extension raphf extension
-  else
-    add_pecl_extension raphf 1.1.2 extension
-    add_pecl_extension propro 1.0.2 extension
-  fi
-}
-
-# Function to install the dependencies.
-add_http_dependencies() {
-  os=$1
-  if [ "$os" = 'Linux' ]; then
-    add_http_dependencies_linux
-  else
-    add_http_dependencies_darwin
-  fi
-}
-
-# Function to get configure options for http.
-get_http_configure_opts() {
-  os=$1
-  if [ "$os" = 'Linux' ]; then
-    for lib in zlib libbrotli libcurl libevent libicu libidn2 libidn libidnkit2 libidnkit; do
-      http_opts+=( "--with-http-$lib-dir=/usr" )
-    done
-  else
-    http_opts+=( "--with-http-zlib-dir=$(xcrun --show-sdk-path)/usr" )
-    http_opts+=( "--with-http-libbrotli-dir=$(brew --prefix brotli)" )
-    http_opts+=( "--with-http-libcurl-dir=$(brew --prefix curl)" )
-    http_opts+=( "--with-http-libicu-dir=$(brew --prefix icu4c)" )
-    http_opts+=( "--with-http-libevent-dir=$(brew --prefix libevent)" )
-    http_opts+=( "--with-http-libidn2-dir=$(brew --prefix libidn2)" )
-  fi
-}
-
-patch_http_source() {
-  ext=$1
-  os=$2
-  if [ "$os" = 'Darwin' ] && ! [[ ${version:?} =~ ${old_versions:?} ]]; then
-    if [[ ${version:?} =~ 5.6|7.[0-4] ]]; then
-      sed -i '' -e "s|ext/propro|$(brew --prefix propro@"${version:?}")/include/php/ext/propro@${version:?}|" "/tmp/pecl_http-${ext##*-}/src/php_http_api.h"
-    fi
-    sed -i '' -e "s|ext/raphf|$(brew --prefix raphf@"${version:?}")/include/php/ext/raphf@${version:?}|" "/tmp/pecl_http-${ext##*-}/src/php_http_api.h"
-    if [ "${version:?}" = "5.6" ]; then
-      sed -i '' -e "s|\$abs_srcdir|\$abs_srcdir ${brew_prefix:?}/include|" -e "s|/ext/propro|/php/ext/propro@5.6|" -e "s|/ext/raphf|/php/ext/raphf@5.6|" "/tmp/pecl_http-${ext##*-}/config9.m4"
-    fi
-  fi
-}
-
-# Helper function to compile and install http.
-build_http() {
-  ext=$1
-  os=$2
-  (
-    http_opts=() && get_http_configure_opts "$os"
-    c_opts="CFLAGS=-Wno-implicit-function-declaration"
-    cd /tmp/pecl_http-"${ext##*-}" || exit
-    sudo phpize
-    sudo "$c_opts" ./configure --with-http --with-php-config="$(command -v php-config)" "${http_opts[@]}"
-    sudo make -j"$(nproc 2>/dev/null || sysctl -n hw.ncpu)"
-    sudo make install
-  )
-}
-
-# Compile and install http explicitly.
-# This is done as pecl compiles raphf and propro as well.
-add_http_helper() {
-  ext=$1
-  os=$2
-  add_http_dependencies "$os"
-  get -q -n /tmp/http.tgz https://pecl.php.net/get/pecl_http-"${ext##*-}".tgz
-  tar -xzf /tmp/http.tgz -C /tmp
-  patch_http_source "$ext" "$os"
-  build_http "$ext" "$os"
-  enable_extension http extension
-}
-
-# Function to setup latest http extension.
-add_http_latest() {
-  os=$1
-  enable_http
-  if ! check_extension http; then
-    if [ "$os" = "Linux" ]; then
-      if ! [[ "${version:?}" =~ ${old_versions:?}|${nightly_versions:?} ]]; then
-        if [[ ${version:?} =~ 5.6|7.[0-4] ]]; then
-          install_packages "php$version-propro"
-        fi
-        install_packages "php$version-raphf" "php$version-http"
-      else
-        add_http_helper "$(get_http_version)" "$os"
-      fi
-    else
-      if ! [[ "${version:?}" =~ ${old_versions:?} ]]; then
-        add_brew_extension pecl_http extension
-      fi
-    fi
-    status="Installed and enabled"
-  fi
-}
-
-# Function to setup http extension given a version.
-add_http_version() {
-  ext=$1
-  os=$2
-  enable_http
-  if [ "x$(php -r "echo phpversion('http');")" != "x${ext##*-}" ]; then
-    remove_extension http >/dev/null
-    add_http_helper pecl_http-"${ext##*-}" "$os"
-    status="Installed and enabled"
-  fi
-}
-
-# Function to setup http extension
-add_http() {
-  ext=$1
-  os="$(uname -s)"
-  status="Enabled"
-  if [[ "$ext" =~ ^(pecl_http|http)$ ]]; then
-    add_http_latest "$os" >/dev/null 2>&1
-  else
-    add_http_version "$ext" "$os" >/dev/null 2>&1
-  fi
-  add_extension_log "http" "$status"
-}

src/scripts/ext/intl.sh

@@ -1,23 +0,0 @@
-# Function to install ICU
-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"
-    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
-}
-
-# 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)
-  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"
-    enable_extension intl extension
-    add_extension_log intl "Installed and enabled with ICU $icu"
-  fi
-}

src/scripts/ext/ioncube.ps1

@@ -19,7 +19,7 @@ Function Add-Ioncube() {
       if (-not($installed.ThreadSafe)) {
         $ts_part = "_nonts"
       }
-      Invoke-WebRequest -Uri "https://downloads.ioncube.com/loader_downloads/ioncube_loaders_win$ts_part`_vc$vc`_$arch_part.zip" -OutFile $ext_dir\ioncube.zip
+      Invoke-WebRequest -UseBasicParsing -Uri "https://downloads.ioncube.com/loader_downloads/ioncube_loaders_win$ts_part`_vc$vc`_$arch_part.zip" -OutFile $ext_dir\ioncube.zip
       Expand-Archive -Path $ext_dir\ioncube.zip -DestinationPath $ext_dir -Force
       Copy-Item $ext_dir\ioncube\ioncube_loader_win_$version.dll $ext_dir\php_ioncube.dll
     }

src/scripts/ext/ioncube.sh

@@ -10,7 +10,7 @@ add_ioncube() {
   if [ ! -e "${ext_dir:?}/ioncube.so" ]; then
     status='Installed and enabled'
     os_name='lin' && [ "$(uname -s)" = "Darwin" ] && os_name='mac'
-    get -s -n "" https://downloads.ioncube.com/loader_downloads/ioncube_loaders_"$os_name"_x86-64.tar.gz | tar -xzf - -C /tmp
+    curl "${curl_opts[@]:?}" https://downloads.ioncube.com/loader_downloads/ioncube_loaders_"$os_name"_x86-64.tar.gz | tar -xzf - -C /tmp
     sudo mv /tmp/ioncube/ioncube_loader_"$os_name"_"${version:?}".so "$ext_dir/ioncube.so"
   fi
   echo "zend_extension=$ext_dir/ioncube.so" | sudo tee "${scan_dir:?}/00-ioncube.ini" >/dev/null 2>&1

src/scripts/ext/oci.ps1

@@ -14,14 +14,14 @@ Function Add-InstantClient() {
     if ($arch -eq 'x86') {
       $suffix = 'nt'
     }
-    Invoke-WebRequest -Uri https://download.oracle.com/otn_software/nt/instantclient/instantclient-basiclite-$suffix.zip -OutFile $php_dir\instantclient.zip
+    Invoke-WebRequest -UseBasicParsing -Uri https://download.oracle.com/otn_software/nt/instantclient/instantclient-basiclite-$suffix.zip -OutFile $php_dir\instantclient.zip
     Expand-Archive -Path $php_dir\instantclient.zip -DestinationPath $php_dir -Force
     Copy-Item $php_dir\instantclient*\* $php_dir
   }
 }
 
 # Function to install oci8 and pdo_oci.
-Function Add-Oci() {
+Function Add-OCI() {
   Param (
     [Parameter(Position = 0, Mandatory = $true)]
     [ValidateNotNull()]
@@ -35,21 +35,16 @@ Function Add-Oci() {
     if ($extension -eq "pdo_oci") {
       Enable-PhpExtension pdo_oci -Path $php_dir
     } else {
-      if(-not(Test-Path $ext_dir\php_oci8.dll)) {
+      $status = 'Installed and enabled'
-        $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') {
-        if ($version -eq '7.0') {
+        $ociVersion = '2.1.8'
-          $ociVersion = '2.1.8'
+      } elseif ($version -lt '7.0') {
-        } elseif ($version -lt '7.0') {
+        $ociVersion = '2.0.12'
-          $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
-        Expand-Archive -Path $php_dir\oci8.zip -DestinationPath $ext_dir -Force
-
       }
+      $ociUrl = Get-PeclArchiveUrl oci8 $ociVersion $installed
+      Invoke-WebRequest -UseBasicParsing -Uri $ociUrl -OutFile $php_dir\oci8.zip
+      Expand-Archive -Path $php_dir\oci8.zip -DestinationPath $ext_dir -Force
       Add-Content -Value "`r`nextension=php_oci8.dll" -Path $php_dir\php.ini
     }
     Add-Log $tick $extension $status

src/scripts/ext/oci.sh

@@ -7,6 +7,16 @@ add_license_log() {
   echo "::endgroup::"
 }
 
+# Function to get the tag for a php version.
+get_tag() {
+  master_version='8.0'
+  tag='master'
+  if [ ! "${version:?}" = "$master_version" ]; then
+    tag="php-$(php -v | head -n 1 | cut -f 2 -d ' ' | cut -f 1 -d '-')"
+  fi
+  echo "$tag"
+}
+
 # Function to install instantclient and SDK.
 add_client() {
   sudo mkdir -p -m 777 "$oracle_home"
@@ -23,7 +33,7 @@ add_client() {
         arch='macos'
         lib_ext='dylib'
       fi
-      get -q -n "/opt/oracle/$package.zip" "https://download.oracle.com/otn_software/$os_name/instantclient/instantclient-$package-$arch.zip"
+      curl -o "/opt/oracle/$package.zip" "${curl_opts[@]:?}" "https://download.oracle.com/otn_software/$os_name/instantclient/instantclient-$package-$arch.zip"
       unzip "/opt/oracle/$package.zip" -d "$oracle_home"
     done
     sudo ln -sf /opt/oracle/instantclient*/*.$lib_ext* $libs
@@ -33,12 +43,12 @@ add_client() {
 
 # 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/"
+  [ ! -d "/opt/oracle/php-src-$tag" ] && curl "${curl_opts[@]}" "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
+  if [[ "$version" =~ 5.[3-5] ]]; then
     echo '/opt/local/bin/phpize'
   else
     echo "/usr/local/bin/$(readlink /usr/local/bin/phpize)"
@@ -62,19 +72,21 @@ restore_phpize() {
 
 # 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
+  curl -O "${curl_opts[@]}" https://raw.githubusercontent.com/php/php-src/master/ext/pdo_oci/config.m4
-  if [[ ${version:?} =~ 5.[3-6] ]]; then
+  sudo sed -i '' "/PHP_CHECK_PDO_INCLUDES/d" config.m4 || sudo sed -i "/PHP_CHECK_PDO_INCLUDES/d" config.m4
-    sudo sed -i '' "/PHP_CHECK_PDO_INCLUDES/d" config.m4 2>/dev/null || sudo sed -i "/PHP_CHECK_PDO_INCLUDES/d" config.m4
-  fi
 }
 
 # Function to install the dependencies.
 add_dependencies() {
   if [ "$os" = 'Linux' ]; then
     if [ "${runner:?}" = "self-hosted" ]; then
-      ${apt_install:?} --no-upgrade --no-install-recommends libaio-dev
+      ${apt_install:?} autoconf automake libaio-dev gcc g++ php"$version"-dev
+    else
+      update_lists
+      ${apt_install:?} php"$version"-dev
     fi
-    ! [[ ${version:?} =~ $nightly_versions ]] && add_devtools phpize
+    sudo update-alternatives --set php-config /usr/bin/php-config"$version"
+    sudo update-alternatives --set phpize /usr/bin/phpize"$version"
   fi
 }
 
@@ -83,14 +95,14 @@ add_oci_helper() {
   if ! [ -e "${ext_dir:?}/$ext.so" ]; then
     status='Installed and enabled'
     phpize_orig=$(get_phpize)
-    tag=$(php_src_tag)
+    tag=$(get_tag)
     get_php
     patch_phpize
     (
       cd "/opt/oracle/php-src-$tag/ext/$ext" || exit 1
       [ "$ext" = "pdo_oci" ] && patch_pdo_oci_config
       sudo phpize && ./configure --with-php-config="$(command -v php-config)" --with-"${ext/_/-}"=instantclient,"$oracle_client"
-      sudo make -j"$(nproc 2>/dev/null || sysctl -n hw.ncpu)"
+      sudo make -j"$(nproc)"
       sudo cp ./modules/* "$ext_dir/"
     )
     restore_phpize

src/scripts/ext/phalcon.ps1

@@ -5,9 +5,9 @@ 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 -UseBasicParsing -Uri $domain/phalcon/cphalcon/releases | Select-String -Pattern "href=`"(.*phalcon_x64_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)`""
     $zip_file = $match.Matches[0].Groups[1].Value
-    Invoke-WebRequest -Uri $domain/$zip_file -OutFile $ENV:RUNNER_TOOL_CACHE\phalcon.zip > $null 2>&1
+    Invoke-WebRequest -UseBasicParsing -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
     Copy-Item -Path "$ENV:RUNNER_TOOL_CACHE\phalcon\php_phalcon.dll" -Destination "$ext_dir\php_phalcon.dll"
     Enable-PhpExtension -Extension phalcon -Path $php_dir

src/scripts/ext/phalcon.sh

@@ -3,17 +3,14 @@ add_phalcon_helper() {
   status='Installed and enabled'
   if [ "$os_name" = "Linux" ]; then
     update_lists
-    if [ "$extension" = "phalcon4" ]; then
+    ${apt_install:?} "php${version:?}-$extension"
-      ${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:?}"
-    add_brew_tap shivammathur/homebrew-phalcon
+    brew tap shivammathur/homebrew-phalcon
     brew install phalcon@"${version:?}"_"$extension_major_version"
-    sudo cp "${brew_prefix:?}"/opt/psr@"${version:?}"/psr.so "${ext_dir:?}"
+    sudo cp /usr/local/opt/psr@"${version:?}"/psr.so "${ext_dir:?}"
-    sudo cp "${brew_prefix:?}"/opt/phalcon@"${version:?}"_"$extension_major_version"/phalcon.so "${ext_dir:?}"
+    sudo cp /usr/local/opt/phalcon@"${version:?}"_"$extension_major_version"/phalcon.so "${ext_dir:?}"
   fi
 }
 
@@ -28,7 +25,7 @@ add_phalcon3() {
     fi
   else
     add_phalcon_helper
-  fi
+  fi  
 }
 
 # Function to add phalcon4.
@@ -49,7 +46,7 @@ add_phalcon4() {
     fi
   else
     add_phalcon_helper
-  fi
+  fi  
 }
 
 # Function to add phalcon.
@@ -57,7 +54,7 @@ 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/linux.sh

@@ -1,129 +1,170 @@
-# Function to setup environment for self-hosted runners.
+# Function to log start of a operation.
-self_hosted_helper() {
+step_log() {
-  if ! command -v apt-fast >/dev/null; then
+  message=$1
-    sudo ln -sf /usr/bin/apt-get /usr/bin/apt-fast
+  printf "\n\033[90;1m==> \033[0m\033[37;1m%s\033[0m\n" "$message"
+}
+
+# Function to log result of a operation.
+add_log() {
+  mark=$1
+  subject=$2
+  message=$3
+  if [ "$mark" = "$tick" ]; then
+    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"
   fi
-  install_packages curl make software-properties-common unzip autoconf automake gcc g++
+}
-  add_ppa ondrej/ppa
+
+# 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"
+  ) || add_log "$cross" "$extension_name" "Could not install $extension on PHP $semver"
+}
+
+# Function to read env inputs.
+read_env() {
+  . /etc/lsb-release
+  [[ -z "${update}" ]] && update='false' && UPDATE='false' || update="${update}"
+  [ "$update" = false ] && [[ -n ${UPDATE} ]] && update="${UPDATE}"
+  [[ -z "${runner}" ]] && runner='github' && RUNNER='github' || runner="${runner}"
+  [ "$runner" = false ] && [[ -n ${RUNNER} ]] && runner="${RUNNER}"
 }
 
 # 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/*"${ppa_prefix}"*.list /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/*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/" exit
-    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() {
-  ppa=${1:-ondrej/php}
+  if ! apt-cache policy | grep -q ondrej/php; then
-  if ! apt-cache policy | grep -q "$ppa"; then
+    cleanup_lists
-    cleanup_lists "$(dirname "$ppa")"
+    LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y
-    LC_ALL=C.UTF-8 sudo apt-add-repository ppa:"$ppa" -y
     if [ "$DISTRIB_RELEASE" = "16.04" ]; then
       sudo "$debconf_fix" apt-get update
     fi
   fi
 }
 
-# Function to add SAPI
-add_sapi() {
-  sapi=$1
-  status='true'
-  if [ "$sapi" != "cli" ]; then
-    # shellcheck source=.
-    . "${dist}"/../src/scripts/sapi.sh
-    setup_sapi "$sapi" >/dev/null 2>&1
-  fi
-  check_sapi "$sapi"
-  if check_sapi "$sapi"; then
-    add_log "${tick:?}" "$sapi" "Added $sapi"
-  else
-    add_log "${cross:?}" "$sapi" "Could not setup $sapi"
-  fi
-}
-
 # Function to update the package lists.
 update_lists() {
   if [ ! -e /tmp/setup_php ]; then
     [ "$DISTRIB_RELEASE" = "20.04" ] && add_ppa >/dev/null 2>&1
     cleanup_lists
     sudo "$debconf_fix" apt-get update >/dev/null 2>&1
-    echo '' | sudo tee /tmp/setup_php >/dev/null 2>&1
+    echo '' | sudo tee "/tmp/setup_php" >/dev/null 2>&1
   fi
 }
 
-# Function to install a package
+# Function to setup environment for self-hosted runners.
-install_packages() {
+self_hosted_setup() {
-  packages=("$@")
+  echo "Set disable_coredump false" | sudo tee -a /etc/sudo.conf
-  $apt_install "${packages[@]}" >/dev/null 2>&1 || update_lists && $apt_install "${packages[@]}" >/dev/null 2>&1
+  if ! command -v apt-fast >/dev/null; then
+    sudo ln -sf /usr/bin/apt-get /usr/bin/apt-fast
+  fi
+  update_lists && $apt_install curl make software-properties-common unzip
+  add_ppa
 }
 
-# Function to disable an extension.
+# Function to configure PECL.
-disable_extension() {
+configure_pecl() {
+  if [ "$pecl_config" = "false" ] && [ -e /usr/bin/pecl ]; then
+
+    for tool in pear pecl; do
+      sudo "$tool" config-set php_ini "$scan_dir"/99-pecl.ini
+      sudo "$tool" channel-update "$tool".php.net
+    done
+    pecl_config="true"
+  fi
+}
+
+# Fuction to get the PECL version of an extension.
+get_pecl_version() {
   extension=$1
-  sudo sed -Ei "/=(.*\/)?\"?$extension(.so)?$/d" "${ini_file[@]}"
+  stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot)")"
-  sudo sed -Ei "/=(.*\/)?\"?$extension(.so)?$/d" "$pecl_file"
+  pecl_rest='https://pecl.php.net/rest/r/'
-  sudo find "$ini_dir"/.. -name "*$extension.ini" -delete >/dev/null 2>&1 || true
+  response=$(curl "${curl_opts[@]}" "$pecl_rest$extension"/allreleases.xml)
+  pecl_version=$(echo "$response" | grep -m 1 -Pio "(\d*\.\d*\.\d*$stability\d*)")
+  if [ ! "$pecl_version" ]; then
+    pecl_version=$(echo "$response" | grep -m 1 -Po "(\d*\.\d*\.\d*)")
+  fi
+  echo "$pecl_version"
 }
 
-# Function to delete an extension.
+# Function to install PECL extensions and accept default options
+pecl_install() {
+  local extension=$1
+  yes '' | sudo pecl install -f "$extension" >/dev/null 2>&1
+}
+
+# Function to check if an extension is loaded.
+check_extension() {
+  extension=$1
+  if [ "$extension" != "mysql" ]; then
+    php -m | grep -i -q -w "$extension"
+  else
+    php -m | grep -i -q "$extension"
+  fi
+}
+
+# Function to delete extensions.
 delete_extension() {
   extension=$1
-  disable_extension "$extension"
+  sudo sed -i "/$extension/d" "$ini_file"
+  sudo sed -i "/$extension/d" "$pecl_file"
+  sudo rm -rf "$scan_dir"/*"$extension"* >/dev/null 2>&1
   sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1
-  if [ "${runner:?}" = "self-hosted" ]; then
-    $apt_remove "php-$extension" "php$version-$extension" >/dev/null 2>&1 || true
-  fi
 }
 
 # Function to disable and delete extensions.
 remove_extension() {
   extension=$1
   if check_extension "$extension"; then
-    if [[ ! "$version" =~ ${old_versions:?} ]] && [ -e /etc/php/"$version"/mods-available/"$extension".ini ]; 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") ||
+    (! check_extension "$extension" && add_log "$tick" ":$extension" "Removed") ||
-      add_log "${cross:?}" ":$extension" "Could not remove $extension on PHP ${semver:?}"
+    add_log "$cross" ":$extension" "Could not remove $extension on PHP $semver"
   else
-    delete_extension "$extension"
+    add_log "$tick" ":$extension" "Could not find $extension on PHP $semver"
-    add_log "${tick:?}" ":$extension" "Could not find $extension on PHP $semver"
   fi
 }
 
-# Function to add PDO extension.
+# Function to enable existing extensions.
+enable_extension() {
+  if ! check_extension "$1" && [ -e "$ext_dir/$1.so" ]; then
+    echo "$2=$1.so" >>"$pecl_file"
+  fi
+}
+
+# Funcion to add PDO extension.
 add_pdo_extension() {
   pdo_ext="pdo_$1"
   if check_extension "$pdo_ext"; then
-    add_log "${tick:?}" "$pdo_ext" "Enabled"
+    add_log "$tick" "$pdo_ext" "Enabled"
   else
-    ext=$1
+    read -r ext ext_name <<< "$1 $1"
-    ext_name=$1
+    sudo rm -rf "$scan_dir"/*pdo.ini >/dev/null 2>&1
-    disable_extension pdo
+    if ! check_extension "pdo" 2>/dev/null; then echo "extension=pdo.so" >> "$ini_file"; fi
-    echo "extension=pdo.so" | sudo tee "${ini_file[@]/php.ini/conf.d/10-pdo.ini}" >/dev/null 2>&1
     if [ "$ext" = "mysql" ]; then
       enable_extension "mysqlnd" "extension"
-      ext_name='mysqli'
+      ext_name="mysqli"
-    elif [ "$ext" = "dblib" ]; then
-      ext_name="sybase"
-    elif [ "$ext" = "firebird" ]; then
-      install_packages libfbclient2 >/dev/null 2>&1
-      enable_extension "pdo_firebird" "extension"
-      ext_name="interbase"
     elif [ "$ext" = "sqlite" ]; then
-      ext="sqlite3"
+      read -r ext ext_name <<< "sqlite3 sqlite3"
-      ext_name="sqlite3"
     fi
-    add_extension "$ext_name" "extension" >/dev/null 2>&1
+    add_extension "$ext_name" "$apt_install php$version-$ext" "extension" >/dev/null 2>&1
-    add_extension "$pdo_ext" "extension" >/dev/null 2>&1
+    enable_extension "$pdo_ext" "extension"
     add_extension_log "$pdo_ext" "Enabled"
   fi
 }
@@ -131,21 +172,20 @@ add_pdo_extension() {
 # Function to add extensions.
 add_extension() {
   extension=$1
-  prefix=$2
+  install_command=$2
+  prefix=$3
   enable_extension "$extension" "$prefix"
   if check_extension "$extension"; then
-    add_log "${tick:?}" "$extension" "Enabled"
+    add_log "$tick" "$extension" "Enabled"
   else
     if [[ "$version" =~ 5.[4-5] ]]; then
-      install_packages "php5-$extension=$release_version"
+      install_command="update_lists && ${install_command/5\.[4-5]-$extension/5-$extension=$release_version}"
-    elif [[ "$version" =~ ${nightly_versions:?} ]]; then
-      pecl_install "$extension"
-    else
-      install_packages "php$version-$extension" || pecl_install "$extension"
     fi
+    eval "$install_command" >/dev/null 2>&1 ||
+    (update_lists && eval "$install_command" >/dev/null 2>&1) || pecl_install "$extension"
     add_extension_log "$extension" "Installed and enabled"
   fi
-  sudo chmod 777 "${ini_file[@]}"
+  sudo chmod 777 "$ini_file"
 }
 
 # Function to install a PECL version.
@@ -153,13 +193,15 @@ add_pecl_extension() {
   extension=$1
   pecl_version=$2
   prefix=$3
-  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot|preview).* ]]; then
+  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot).* ]]; then
     pecl_version=$(get_pecl_version "$extension" "$pecl_version")
   fi
-  enable_extension "$extension" "$prefix"
+  if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
+    echo "$prefix=$ext_dir/$extension.so" >>"$pecl_file"
+  fi
   ext_version=$(php -r "echo phpversion('$extension');")
   if [ "$ext_version" = "$pecl_version" ]; then
-    add_log "${tick:?}" "$extension" "Enabled"
+    add_log "$tick" "$extension" "Enabled"
   else
     delete_extension "$extension"
     pecl_install "$extension-$pecl_version"
@@ -167,65 +209,163 @@ add_pecl_extension() {
   fi
 }
 
+# Function to pre-release extensions using PECL.
+add_unstable_extension() {
+  extension=$1
+  stability=$2
+  prefix=$3
+  pecl_version=$(get_pecl_version "$extension" "$stability")
+  add_pecl_extension "$extension" "$pecl_version" "$prefix"
+}
+
+# Function to install extension from source
+add_extension_from_source() {
+  extension=$1
+  repo=$2
+  release=$3
+  args=$4
+  prefix=$5
+  (
+    add_devtools
+    delete_extension "$extension"
+    curl -o /tmp/"$extension".tar.gz "${curl_opts[@]}" 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 && sudo make install
+    enable_extension "$extension" "$prefix"
+  ) >/dev/null 2>&1
+  add_extension_log "$extension-$release" "Installed and enabled"
+}
+
+# Function to configure composer
+configure_composer() {
+  tool_path=$1
+  sudo ln -sf "$tool_path" "$tool_path.phar"
+  php -r "try {\$p=new Phar('$tool_path.phar', 0);exit(0);} catch(Exception \$e) {exit(1);}"
+  if [ $? -eq 1 ]; then
+    add_log "$cross" "composer" "Could not download composer"
+    exit 1;
+  fi
+  composer -q global config process-timeout 0
+  echo "::add-path::/home/$USER/.composer/vendor/bin"
+  if [ -n "$COMPOSER_TOKEN" ]; then
+    composer -q global config github-oauth.github.com "$COMPOSER_TOKEN"
+  fi
+}
+
+# Function to setup a remote tool.
+add_tool() {
+  url=$1
+  tool=$2
+  tool_path="$tool_path_dir/$tool"
+  if [ ! -e "$tool_path" ]; then
+    rm -rf "$tool_path"
+  fi
+  if [ "$tool" = "composer" ]; then
+    IFS="," read -r -a urls <<< "$url"
+    status_code=$(sudo curl -s -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "${urls[0]}") ||
+    status_code=$(sudo curl -s -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "${urls[1]}")
+  else
+    status_code=$(sudo curl -s -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "$url")
+  fi
+  if [ "$status_code" = "200" ]; then
+    sudo chmod a+x "$tool_path"
+    if [ "$tool" = "composer" ]; then
+      configure_composer "$tool_path"
+    elif [ "$tool" = "cs2pr" ]; then
+      sudo sed -i 's/\r$//; s/exit(9)/exit(0)/' "$tool_path"
+    elif [ "$tool" = "phan" ]; then
+      add_extension fileinfo "$apt_install php$version-fileinfo" extension >/dev/null 2>&1
+      add_extension ast "$apt_install php-ast" extension >/dev/null 2>&1
+    elif [ "$tool" = "phive" ]; then
+      add_extension curl "$apt_install php$version-curl" extension >/dev/null 2>&1
+      add_extension mbstring "$apt_install php$version-mbstring" extension >/dev/null 2>&1
+      add_extension xml "$apt_install php$version-xml" extension >/dev/null 2>&1
+    elif [ "$tool" = "wp-cli" ]; then
+      sudo cp -p "$tool_path" "$tool_path_dir"/wp
+    fi
+    add_log "$tick" "$tool" "Added"
+  else
+    add_log "$cross" "$tool" "Could not setup $tool"
+  fi
+}
+
+# Function to setup a tool using composer.
+add_composertool() {
+  tool=$1
+  release=$2
+  prefix=$3
+  (
+    composer global require "$prefix$release" >/dev/null 2>&1 &&
+    add_log "$tick" "$tool" "Added"
+  ) || add_log "$cross" "$tool" "Could not setup $tool"
+}
+
 # Function to setup phpize and php-config.
 add_devtools() {
-  tool=$1
+  if ! [ -e "/usr/bin/phpize$version" ] || ! [ -e "/usr/bin/php-config$version" ]; then
-  if ! command -v "$tool$version" >/dev/null; then
+    update_lists && $apt_install php"$version"-dev php"$version"-xml >/dev/null 2>&1
-    install_packages "php$version-dev" "php$version-xml"
   fi
   sudo update-alternatives --set php-config /usr/bin/php-config"$version" >/dev/null 2>&1
   sudo update-alternatives --set phpize /usr/bin/phpize"$version" >/dev/null 2>&1
   configure_pecl >/dev/null 2>&1
-  add_log "${tick:?}" "$tool" "Added $tool $semver"
 }
 
-# Function to setup the nightly build from shivammathur/php-builder
+# Function to setup the nightly build from master branch.
-setup_nightly() {
+setup_master() {
-  run_script "php-builder" "$runner" "$version"
+  curl "${curl_opts[@]}" "$github"/php-builder/releases/latest/download/install.sh | bash -s "$runner"
 }
 
 # Function to setup PHP 5.3, PHP 5.4 and PHP 5.5.
 setup_old_versions() {
-  run_script "php5-ubuntu" "$version"
+  curl "${curl_opts[@]}" "$github"/php5-ubuntu/releases/latest/download/install.sh | bash -s "$version"
+  configure_pecl
   release_version=$(php -v | head -n 1 | cut -d' ' -f 2)
 }
 
 # Function to add PECL.
 add_pecl() {
-  add_devtools phpize >/dev/null 2>&1
+  add_devtools >/dev/null 2>&1
-  if ! command -v pecl >/dev/null; then
+  if [ ! -e /usr/bin/pecl ]; then
-    install_packages php-pear
+    $apt_install php-pear >/dev/null 2>&1 || update_lists && $apt_install php-pear >/dev/null 2>&1
   fi
   configure_pecl >/dev/null 2>&1
-  pecl_version=$(get_tool_version "pecl" "version")
+  add_log "$tick" "PECL" "Added"
-  add_log "${tick:?}" "PECL" "Added PECL $pecl_version"
 }
 
 # 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
     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
-  wait "${to_wait[@]}"
+}
+
+# Function to get PHP version in semver format.
+php_semver() {
+  if [ ! "$version" = "$master_version" ]; then
+    php"$version" -v | head -n 1 | cut -f 2 -d ' ' | cut -f 1 -d '-'
+  else
+    php -v | head -n 1 | cut -f 2 -d ' '
+  fi
 }
 
 # Function to install packaged PHP
 add_packaged_php() {
   if [ "$runner" = "self-hosted" ] || [ "${use_package_cache:-true}" = "false" ]; then
     update_lists
-    IFS=' ' read -r -a packages <<<"$(echo "cli curl mbstring xml intl" | sed "s/[^ ]*/php$version-&/g")"
+    IFS=' ' read -r -a packages <<< "$(echo "cli curl mbstring xml intl" | sed "s/[^ ]*/php$version-&/g")"
     $apt_install "${packages[@]}"
   else
-    run_script "test-setup-php" "$version"
+    curl "${curl_opts[@]}" "$github"/php-ubuntu/releases/latest/download/install.sh | bash -s "$version"
   fi
 }
 
 # Function to update PHP.
 update_php() {
   initial_version=$(php_semver)
+  use_package_cache="false"
   add_packaged_php
   updated_version=$(php_semver)
   if [ "$updated_version" != "$initial_version" ]; then
@@ -237,9 +377,9 @@ update_php() {
 
 # Function to install PHP.
 add_php() {
-  if [[ "$version" =~ ${nightly_versions:?} ]]; then
+  if [ "$version" = "$master_version" ]; then
-    setup_nightly
+    setup_master
-  elif [[ "$version" =~ ${old_versions:?} ]]; then
+  elif [[ "$version" =~ $old_versions ]]; then
     setup_old_versions
   else
     add_packaged_php
@@ -247,69 +387,62 @@ add_php() {
   status="Installed"
 }
 
-# Function to ini file for pear and link it to each SAPI.
+# Variables
-link_pecl_file() {
+tick="✓"
-  echo '' | sudo tee "$pecl_file" >/dev/null 2>&1
+cross="✗"
-  for file in "${ini_file[@]}"; do
+pecl_config="false"
-    sapi_scan_dir="$(realpath -m "$(dirname "$file")")/conf.d"
+version=$1
-    [ "$sapi_scan_dir" != "$scan_dir" ] && ! [ -h "$sapi_scan_dir" ] && sudo ln -sf "$pecl_file" "$sapi_scan_dir/99-pecl.ini"
+master_version="8.0"
-  done
+old_versions="5.[3-5]"
-}
+debconf_fix="DEBIAN_FRONTEND=noninteractive"
+github="https://github.com/shivammathur"
+apt_install="sudo $debconf_fix apt-fast install -y"
+tool_path_dir="/usr/local/bin"
+curl_opts=(-sL)
+existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
 
-# Function to Setup PHP
+read_env
-setup_php() {
+if [ "$runner" = "self-hosted" ]; then
-  step_log "Setup PHP"
+  if [[ "$version" =~ $old_versions ]]; then
-  sudo mkdir -m 777 -p /var/run /run/php
+    add_log "$cross" "PHP" "PHP $version is not supported on self-hosted runner"
-  if [ "$(php-config --version 2>/dev/null | cut -c 1-3)" != "$version" ]; then
+    exit 1
-    if [ ! -e "/usr/bin/php$version" ]; then
+  else
-      add_php >/dev/null 2>&1
+    self_hosted_setup >/dev/null 2>&1
-    else
+  fi
-      if [ "${update:?}" = "true" ]; then
+fi
-        update_php >/dev/null 2>&1
+
-      else
+# Setup PHP
-        status="Switched to"
+step_log "Setup PHP"
-      fi
+sudo mkdir -p /var/run /run/php
-    fi
+if [ "$existing_version" != "$version" ]; then
-    if ! [[ "$version" =~ ${old_versions:?}|${nightly_versions:?} ]]; then
+  if [ ! -e "/usr/bin/php$version" ]; then
-      switch_version >/dev/null 2>&1
+    add_php >/dev/null 2>&1
-    fi
   else
     if [ "$update" = "true" ]; then
       update_php >/dev/null 2>&1
     else
-      status="Found"
+      status="Switched to"
     fi
   fi
-  if ! command -v php"$version" >/dev/null; then
+  if ! [[ "$version" =~ $old_versions ]]; then
-    add_log "$cross" "PHP" "Could not setup PHP $version"
+    switch_version >/dev/null 2>&1
-    exit 1
   fi
-  semver=$(php_semver)
+else
-  ext_dir=$(php -i | grep "extension_dir => /" | sed -e "s|.*=> s*||")
+  if [ "$update" = "true" ]; then
-  scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
+    update_php >/dev/null 2>&1
-  ini_dir=$(php --ini | grep "(php.ini)" | sed -e "s|.*: s*||")
+  else
-  pecl_file="$scan_dir"/99-pecl.ini
+    status="Found"
-  mapfile -t ini_file < <(sudo find "$ini_dir/.." -name "php.ini" -exec readlink -m {} +)
+    if [ "$version" = "$master_version" ]; then
-  link_pecl_file
+      switch_version >/dev/null 2>&1
-  configure_php
+    fi
-  sudo rm -rf /usr/local/bin/phpunit >/dev/null 2>&1
+  fi
-  sudo chmod 777 "${ini_file[@]}" "$pecl_file" "${tool_path_dir:?}"
+fi
-  sudo cp "$dist"/../src/configs/*.json "$RUNNER_TOOL_CACHE/"
-  add_log "${tick:?}" "PHP" "$status PHP $semver"
-}
 
-# Variables
+semver=$(php_semver)
-version=$1
+ext_dir=$(php -i | grep "extension_dir => /" | sed -e "s|.*=> s*||")
-dist=$2
+scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
-debconf_fix="DEBIAN_FRONTEND=noninteractive"
+ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
-apt_install="sudo $debconf_fix apt-fast install -y"
+pecl_file="$scan_dir"/99-pecl.ini
-apt_remove="sudo $debconf_fix apt-fast remove -y"
+echo '' | sudo tee "$pecl_file" >/dev/null 2>&1
-scripts="${dist}"/../src/scripts
+sudo chmod 777 "$ini_file" "$pecl_file" "$tool_path_dir"
-
+add_log "$tick" "PHP" "$status PHP $semver"
-# shellcheck source=.
-. "${scripts:?}"/tools/add_tools.sh
-. "${scripts:?}"/common.sh
-. /etc/lsb-release
-read_env
-self_hosted_setup
-setup_php

src/scripts/sapi/sapi_darwin.sh

@@ -1,116 +0,0 @@
-#!/bin/bash
-
-install_httpd() {
-  sudo mkdir -p /var/www/html
-  sudo chown -R _www:_www /var/www
-  brew services stop nginx 2>/dev/null || true
-  if ! command -v httpd >/dev/null; then
-    brew install httpd
-  fi
-  sudo sed -Ei '' 's/Listen.*/Listen 80/' "$httpd_conf"
-  sudo sed -Ei '' 's/DirectoryIndex.*/DirectoryIndex index.php index.html/' "$httpd_conf"
-}
-
-install_nginx() {
-  sudo mkdir -p /var/www/html
-  sudo chown -R "$(id -un)":"$(id -gn)" /var/www
-  brew services stop httpd 2>/dev/null || true
-  if ! command -v nginx >/dev/null; then
-    brew install nginx
-  fi
-  sudo sed -Ei '' 's/listen.*/listen 80;/' "$nginx_conf"
-}
-
-setup_sapi() {
-  sapi=$1
-  conf_dir="${dist:?}"/../src/configs
-
-  case $sapi in
-  apache*:apache*)
-    install_httpd
-    (
-      echo "LoadModule proxy_module lib/httpd/modules/mod_proxy.so"
-      echo "LoadModule proxy_module lib/httpd/modules/mod_proxy_fcgi.so"
-    ) | sudo tee -a "$httpd_conf"
-    echo "Include $httpd_extra/httpd-php.conf" | sudo tee -a "$httpd_conf"
-
-
-    sudo cp "$conf_dir"/default_apache /etc/apache2/sites-available/000-default.conf
-    sudo a2dismod mpm_event 2>/dev/null || true
-    sudo a2enmod mpm_prefork php"${version:?}"
-    sudo service apache2 restart
-    ;;
-  fpm:apache*)
-    install_httpd
-    sudo cp "$conf_dir"/default_apache /etc/apache2/sites-available/000-default.conf
-    sudo a2dismod php"${version:?}" 2>/dev/null || true
-    sudo a2enmod proxy_fcgi
-    sudo a2enconf php"${version:?}"-fpm
-    sudo service apache2 restart
-    ;;
-  cgi:apache*)
-    install_httpd
-    sudo cp "$conf_dir"/default_apache /etc/apache2/sites-available/000-default.conf
-    echo "Action application/x-httpd-php /cgi-bin/php${version:?}" | sudo tee -a /etc/apache2/conf-available/php"${version:?}"-cgi.conf
-    sudo a2dismod php"${version:?}" mpm_event 2>/dev/null || true
-    sudo a2enmod mpm_prefork actions cgi
-    sudo a2disconf php"${version:?}"-fpm 2>/dev/null || true
-    sudo a2enconf php"${version:?}"-cgi
-    sudo service apache2 restart
-    ;;
-  fpm:nginx)
-    install_nginx
-    sudo cp "$conf_dir"/default_nginx /etc/nginx/sites-available/default
-    sudo sed -i "s/PHP_VERSION/${version:?}/" /etc/nginx/sites-available/default
-    sudo service nginx restart
-    ;;
-  apache* | fpm | cgi | phpdbg) ;;
-
-  esac
-}
-
-check_service() {
-  service=$1
-  if ! pidof "$service"; then
-    return 1
-  fi
-  (
-    printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "$service" "Click to check $service status"
-    sudo service "$service" status
-    echo "::endgroup::"
-  ) | sudo tee -a /tmp/sapi.log >/dev/null 2>&1
-  return 0
-}
-
-check_version() {
-  sapi=$1
-  sapi_version=$(php_semver "$sapi")
-  if [ ${sapi_version%.*} != "${version:?}" ]; then
-    return 1
-  fi
-  add_log "${tick:?}" "$sapi" "Added $sapi $sapi_version" | sudo tee -a /tmp/sapi.log >/dev/null 2>&1
-  return 0
-}
-
-check_sapi() {
-  sapi=$1
-  sudo rm /tmp/sapi.log
-  if [[ "$sapi" =~ fpm|cgi ]]; then status=$(check_version php-"$sapi"); fi
-  if [[ "$sapi" =~ ^phpdbg$ ]]; then status=$(check_version phpdbg); fi
-  if [[ "$sapi" =~ .*fpm.* ]]; then status=$(check_service php"${version:?}"-fpm); fi
-  if [[ "$sapi" =~ .*:apache.* ]]; then status=$(check_service apache2); fi
-  if [[ "$sapi" =~ .*:nginx.* ]]; then status=$(check_service nginx); fi
-
-  if [ "$status" = "0" ]; then
-    if [[ "$sapi" =~ .*:.* ]]; then
-      add_log "${tick:?}" "$sapi" "Added $sapi"
-    fi
-    cat /tmp/sapi.log && sudo rm /tmp/sapi.log
-  else
-    add_log "${cross:?}" "$sapi" "Could not setup $sapi"
-  fi
-}
-
-httpd_conf=${brew_prefix:?}/etc/httpd/httpd.conf
-httpd_extra=${brew_prefix:?}/etc/httpd/extra
-nginx_conf=${brew_prefix:?}/etc/nginx/nginx.conf

src/scripts/sapi/sapi_linux.sh

@@ -1,117 +0,0 @@
-#!/bin/bash
-
-install_apache2() {
-  sudo mkdir -p /var/www/html
-  sudo service nginx stop 2>/dev/null || true
-  if ! command -v apache2 >/dev/null; then
-    install_packages apache2-bin apache2 -y;
-  else
-    if ! [[ "$(apache2 -v 2>/dev/null | grep -Eo "([0-9]+\.[0-9]+)")" =~ 2.[4-9] ]]; then
-      sudo "${debconf_fix:?}" apt-get purge apache* apache-* >/dev/null
-      install_packages apache2-bin apache2 -y;
-    fi
-  fi
-}
-
-install_nginx() {
-  sudo mkdir -p /var/www/html
-  sudo service apache2 stop 2>/dev/null || true
-  if ! command -v nginx >/dev/null; then
-    install_packages nginx -y
-  fi
-}
-
-setup_sapi() {
-  sapi=$1
-  conf_dir="${dist:?}"/../src/configs
-
-  if [[ "${version:?}" =~ ${old_versions:?}|${nightly_versions:?} ]]; then
-    switch_sapi "$sapi"
-  else
-    case $sapi in
-      apache*:apache*)
-        install_apache2
-        sudo cp "$conf_dir"/default_apache /etc/apache2/sites-available/000-default.conf
-        install_packages libapache2-mod-php"${version:?}" -y
-        sudo a2dismod mpm_event 2>/dev/null || true
-        sudo a2enmod mpm_prefork php"${version:?}"
-        sudo service apache2 restart
-        ;;
-      fpm:apache*)
-        install_apache2
-        sudo cp "$conf_dir"/default_apache /etc/apache2/sites-available/000-default.conf
-        install_packages libapache2-mod-fcgid php"${version:?}"-fpm -y
-        sudo a2dismod php"${version:?}" 2>/dev/null || true
-        sudo a2enmod proxy_fcgi
-        sudo a2enconf php"${version:?}"-fpm
-        sudo service apache2 restart
-        ;;
-      cgi:apache*)
-        install_apache2
-        install_packages php"${version:?}"-cgi -y
-        sudo cp "$conf_dir"/default_apache /etc/apache2/sites-available/000-default.conf
-        echo "Action application/x-httpd-php /cgi-bin/php${version:?}" | sudo tee -a /etc/apache2/conf-available/php"${version:?}"-cgi.conf
-        sudo a2dismod php"${version:?}" mpm_event 2>/dev/null || true
-        sudo a2enmod mpm_prefork actions cgi
-        sudo a2disconf php"${version:?}"-fpm 2>/dev/null || true
-        sudo a2enconf php"${version:?}"-cgi
-        sudo service apache2 restart
-        ;;
-      fpm:nginx)
-        install_nginx
-        install_packages php"${version:?}"-fpm -y
-        sudo cp "$conf_dir"/default_nginx /etc/nginx/sites-available/default
-        sudo sed -i "s/PHP_VERSION/${version:?}/" /etc/nginx/sites-available/default
-        sudo service nginx restart
-        ;;
-      apache*)
-        install_packages libapache2-mod-php"${version:?}" -y
-        ;;
-      fpm|embed|cgi|phpdbg)
-        install_packages php"${version:?}"-"$sapi" -y
-        ;;
-    esac
-  fi
-}
-
-check_service() {
-  service=$1
-  if ! pidof "$service"; then
-    return 1
-  fi
-  (
-    printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "$service" "Click to check $service status"
-    sudo service "$service" status
-    echo "::endgroup::"
-  ) | sudo tee -a /tmp/sapi.log >/dev/null 2>&1
-  return 0
-}
-
-check_version() {
-  sapi=$1
-  sapi_version=$(php_semver "$sapi")
-  if [ "${sapi_version%.*}" != "${version:?}" ]; then
-    return 1;
-  fi
-  add_log "${tick:?}" "$sapi" "Added $sapi $sapi_version" | sudo tee -a /tmp/sapi.log >/dev/null 2>&1
-  return 0
-}
-
-check_sapi() {
-  sapi=$1
-  sudo rm /tmp/sapi.log
-  if [[ "$sapi" =~ fpm|cgi ]]; then status=$(check_version php-"$sapi"); fi
-  if [[ "$sapi" =~ ^phpdbg$ ]]; then status=$(check_version phpdbg); fi
-  if [[ "$sapi" =~ .*fpm.* ]]; then status=$(check_service php"${version:?}"-fpm); fi
-  if [[ "$sapi" =~ .*:apache.* ]]; then status=$(check_service apache2); fi
-  if [[ "$sapi" =~ .*:nginx.* ]]; then status=$(check_service nginx); fi
-
-  if [ "$status" = "0" ]; then
-    if [[ "$sapi" =~ .*:.* ]]; then
-      add_log "${tick:?}" "$sapi" "Added $sapi"
-    fi
-    cat /tmp/sapi.log && sudo rm /tmp/sapi.log
-  else
-    add_log "${cross:?}" "$sapi" "Could not setup $sapi"
-  fi
-}

src/scripts/tools/add_tools.ps1

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

@@ -1,24 +0,0 @@
-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/blackfire.ps1

@@ -1,12 +1,8 @@
 # Function to add blackfire and blackfire-agent.
 Function Add-Blackfire() {
-  $arch_name ='amd64'
-  if(-not([Environment]::Is64BitOperatingSystem) -or $version -lt '7.0') {
-    $arch_name = '386'
-  }
   $agent_version = (Invoke-RestMethod https://blackfire.io/api/v1/releases).agent
   $url = "https://packages.blackfire.io/binaries/blackfire-agent/${agent_version}/blackfire-agent-windows_${arch_name}.zip"
-  Invoke-WebRequest -Uri $url -OutFile $bin_dir\blackfire.zip >$null 2>&1
+  Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $bin_dir\blackfire.zip >$null 2>&1
   Expand-Archive -Path $bin_dir\blackfire.zip -DestinationPath $bin_dir -Force >$null 2>&1
   Add-ToProfile $current_profile 'blackfire' "New-Alias blackfire $bin_dir\blackfire.exe"
   Add-ToProfile $current_profile 'blackfire-agent' "New-Alias blackfire-agent $bin_dir\blackfire-agent.exe"
@@ -16,6 +12,6 @@ Function Add-Blackfire() {
   if ((Test-Path env:BLACKFIRE_CLIENT_ID) -and (Test-Path env:BLACKFIRE_CLIENT_TOKEN)) {
     blackfire config --client-id=$env:BLACKFIRE_CLIENT_ID --client-token=$env:BLACKFIRE_CLIENT_TOKEN --ca-cert=$php_dir\ssl\cacert.pem >$null 2>&1
   }
-  Add-Log $tick "blackfire" "Added blackfire $agent_version"
+  Add-Log $tick "blackfire" "Added"
-  Add-Log $tick "blackfire-agent" "Added blackfire-agent $agent_version"
+  Add-Log $tick "blackfire-agent" "Added"
 }

src/scripts/tools/blackfire.sh

@@ -1,6 +1,6 @@
 add_blackfire_linux() {
   sudo mkdir -p /var/run/blackfire
-  get -s -n "" https://packages.blackfire.io/gpg.key | sudo apt-key add -
+  sudo curl "${curl_opts[@]:?}" https://packages.blackfire.io/gpg.key | sudo apt-key add -
   echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
   sudo "${debconf_fix:?}" apt-get update
   ${apt_install:?} blackfire-agent
@@ -29,7 +29,6 @@ add_blackfire() {
   [ "$os" = "Linux" ] && add_blackfire_linux >/dev/null 2>&1
   [ "$os" = "Darwin" ] && add_blackfire_darwin >/dev/null 2>&1
   blackfire_config >/dev/null 2>&1
-  tool_version=$(get_tool_version "blackfire" "version")
+  add_log "${tick:?}" "blackfire" "Added"
-  add_log "${tick:?}" "blackfire" "Added blackfire $tool_version"
+  add_log "${tick:?}" "blackfire-agent" "Added"
-  add_log "${tick:?}" "blackfire-agent" "Added blackfire-agent $tool_version"
 }

src/scripts/tools/grpc_php_plugin.ps1

@@ -9,12 +9,11 @@ Function Add-Msys2() {
 
 Function Add-Grpc_php_plugin() {
   $msys_location = Add-Msys2
-  $logs = . $msys_location\usr\bin\bash -l -c "pacman -S --noconfirm mingw-w64-x86_64-grpc" >$null 2>&1
+  . $msys_location\usr\bin\bash -l -c "pacman -S --noconfirm mingw-w64-x86_64-grpc" >$null 2>&1
-  $grpc_version = Get-ToolVersion 'Write-Output' "$logs"
+  Write-Output "::add-path::$msys_location\mingw64\bin"
-  Write-Output "$msys_location\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
   Write-Output "::set-output name=grpc_php_plugin_path::$msys_location\mingw64\bin\grpc_php_plugin.exe"
   Add-ToProfile $current_profile 'grpc_php_plugin' "New-Alias grpc_php_plugin $msys_location\mingw64\bin\grpc_php_plugin.exe"
-  Add-Log $tick "grpc_php_plugin" "Added grpc_php_plugin $grpc_version"
+  Add-Log $tick "grpc_php_plugin" "Added"
   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"
   Write-Output (Invoke-WebRequest https://raw.githubusercontent.com/grpc/grpc/master/LICENSE).Content
   Write-Output "::endgroup::"

src/scripts/tools/grpc_php_plugin.sh

@@ -1,12 +1,13 @@
 add_bazel() {
-  if ! command -v bazel; then
+  if [ ! "$(command -v bazel)" ]; then
-    if [ "$(uname -s)" = "Linux" ]; then
+    os=$(uname -s)
+    if [ "$os" = "Linux" ]; then
       ${apt_install:?} curl gnupg
-      get -s -n "" https://bazel.build/bazel-release.pub.gpg | sudo apt-key add -
+      curl "${curl_opts[@]:?}" https://bazel.build/bazel-release.pub.gpg | sudo apt-key add -
       echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | sudo tee /etc/apt/sources.list.d/bazel.list
       sudo "${debconf_fix:?}" apt-get update -y
       ${apt_install:?} bazel
-    else
+    elif [ "$os" = "Darwin" ]; then
       brew install bazel
     fi
   fi
@@ -14,49 +15,37 @@ add_bazel() {
 
 get_grpc_tag() {
   if [ "$grpc_tag" = "latest" ]; then
-    grpc_tag=$(get -s -n "" https://github.com/grpc/grpc/releases/latest | grep -Eo -m 1 "v[0-9]+\.[0-9]+\.[0-9]+" | head -n 1)
+    grpc_tag=$(curl "${curl_opts[@]:?}" https://grpc.io/release)
   else
-    if [[ ${grpc_tag:0:1} != "v" ]] ; then grpc_tag="v$grpc_tag"; fi
+    status_code=$(sudo curl -s -w "%{http_code}" -o /tmp/grpc.tmp "${curl_opts[@]:?}" "https://github.com/grpc/grpc/releases/tag/v$grpc_tag")
-    status_code=$(get -v -n /tmp/grpc.tmp "https://github.com/grpc/grpc/releases/tag/$grpc_tag")
+    if [ "$status_code" = "200" ]; then
-    if [ "$status_code" != "200" ]; then
+      grpc_tag="v$grpc_tag"
-      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
+      grpc_tag=$(curl "${curl_opts[@]:?}" https://grpc.io/release)
     fi
   fi
 }
 
-add_grpc_php_plugin_macos() {
-  brew install grpc
-  brew link --force --overwrite grpc >/dev/null 2>&1
-  grpc_tag="v$(brew info grpc | grep "grpc:" | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+")"
-  license_path="$(brew --prefix grpc)/LICENSE"
-}
-
-add_grpc_php_plugin_linux() {
-  get_grpc_tag
-  get -s -n "" "https://github.com/grpc/grpc/archive/$grpc_tag.tar.gz" | tar -xz -C /tmp
-  cd "/tmp/grpc-${grpc_tag:1}" || exit
-  add_bazel
-  if [ "$DISTRIB_RELEASE" = "16.04" ]; then
-    CC="$(command -v gcc)" CXX="$(command -v g++)" ./tools/bazel build src/compiler:grpc_php_plugin
-  else
-    ./tools/bazel build src/compiler:grpc_php_plugin
-  fi
-  sudo mv ./bazel-bin/src/compiler/grpc_php_plugin /usr/local/bin/grpc_php_plugin
-  sudo chmod a+x /usr/local/bin/grpc_php_plugin
-  license_path="/tmp/grpc-${grpc_tag:1}/LICENSE"
-}
-
 add_grpc_php_plugin() {
   grpc_tag=$1
-  license_path=""
+  get_grpc_tag
-  if [ "$(uname -s)" = "Darwin" ]; then
+  (
-    add_grpc_php_plugin_macos >/dev/null 2>&1
+    curl "${curl_opts[@]:?}" "https://github.com/grpc/grpc/archive/$grpc_tag.tar.gz" | tar -xz -C /tmp
-  else
+    cd "/tmp/grpc-${grpc_tag:1}" || exit
-    add_grpc_php_plugin_linux >/dev/null 2>&1
+    add_bazel
-  fi
+    echo "os: $os"
-  echo "::set-output name=grpc_php_plugin_path::$(command -v grpc_php_plugin)"
+    echo "release: $DISTRIB_RELEASE"
-  add_log "${tick:?}" "grpc_php_plugin" "Added grpc_php_plugin ${grpc_tag:1}"
+    if [ "$DISTRIB_RELEASE" = "16.04" ]; then
+      CC="$(command -v gcc)" CXX="$(command -v g++)" ./tools/bazel build src/compiler:grpc_php_plugin
+    else
+      ./tools/bazel build src/compiler:grpc_php_plugin
+    fi
+    sudo mv ./bazel-bin/src/compiler/grpc_php_plugin /usr/local/bin/grpc_php_plugin
+    sudo chmod a+x /usr/local/bin/grpc_php_plugin
+  ) >/dev/null 2>&1
+  echo "::set-output name=grpc_php_plugin_path::/usr/local/bin/grpc_php_plugin"
+  add_log "${tick:?}" "grpc_php_plugin" "Added"
   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 "$license_path"
+  cat "/tmp/grpc-${grpc_tag:1}/LICENSE"
   echo "::endgroup::"
 }

src/scripts/tools/protoc.ps1

@@ -27,11 +27,11 @@ Function Add-Protoc() {
     $arch_num = '32'
   }
   $url = "https://github.com/protocolbuffers/protobuf/releases/download/$protobuf_tag/protoc-$($protobuf_tag -replace 'v', '')-win$arch_num.zip"
-  Invoke-WebRequest -Uri $url -OutFile $bin_dir\protoc.zip >$null 2>&1
+  Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $bin_dir\protoc.zip >$null 2>&1
   Expand-Archive -Path $bin_dir\protoc.zip -DestinationPath $bin_dir\protoc -Force >$null 2>&1
   Move-Item -Path $bin_dir\protoc\bin\protoc.exe -Destination $bin_dir\protoc.exe
   Add-ToProfile $current_profile 'protoc' "New-Alias protoc $bin_dir\protoc.exe"
-  Add-Log $tick "protoc" "Added protoc $($protobuf_tag -replace 'v', '')"
+  Add-Log $tick "protoc" "Added"
   printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "protoc" "Click to read the protoc related license information"
   Write-Output (Invoke-WebRequest https://raw.githubusercontent.com/protocolbuffers/protobuf/master/LICENSE).Content
   Write-Output "::endgroup::"

src/scripts/tools/protoc.sh

@@ -1,12 +1,12 @@
 get_protobuf_tag() {
   if [ "$protobuf_tag" = "latest" ]; then
-    protobuf_tag=$(get -s -n "" https://github.com/protocolbuffers/protobuf/releases/latest 2<&1 | grep -m 1 -Eo "(v[0-9]+\.[0-9]+\.[0-9]+)" | head -n 1)
+    protobuf_tag=$(curl "${curl_opts[@]:?}" https://github.com/protocolbuffers/protobuf/releases/latest 2<&1 | grep -m 1 -Eo "(v[0-9]+.[0-9]+.[0-9]+)" | head -n 1)
   else
-    status_code=$(get -v -n /tmp/protobuf.tmp "https://github.com/protocolbuffers/protobuf/releases/tag/v$protobuf_tag")
+    status_code=$(sudo curl -s -w "%{http_code}" -o /tmp/protobuf.tmp "${curl_opts[@]:?}" "https://github.com/protocolbuffers/protobuf/releases/tag/v$protobuf_tag")
     if [ "$status_code" = "200" ]; then
       protobuf_tag="v$protobuf_tag"
     else
-      protobuf_tag=$(get -s -n "" https://github.com/protocolbuffers/protobuf/releases/latest 2<&1 | grep -m 1 -Eo "(v[0-9]+\.[0-9]+\.[0-9]+)" | head -n 1)
+      protobuf_tag=$(curl "${curl_opts[@]:?}" https://github.com/protocolbuffers/protobuf/releases/latest 2<&1 | grep -m 1 -Eo "(v[0-9]+.[0-9]+.[0-9]+)" | head -n 1)
     fi
   fi
 }
@@ -17,11 +17,11 @@ add_protoc() {
   (
     platform='linux'
     [ "$(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"
+    curl -o /tmp/protobuf.zip "${curl_opts[@]:?}" "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
   ) >/dev/null 2>&1
-  add_log "${tick:?}" "protoc" "Added protoc ${protobuf_tag:1}"
+  add_log "${tick:?}" "protoc" "Added"
   printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "protoc" "Click to read the protoc related license information"
   curl "${curl_opts[@]:?}" https://raw.githubusercontent.com/protocolbuffers/protobuf/master/LICENSE
   echo "::endgroup::"

src/scripts/win32.ps1

@@ -8,7 +8,7 @@ param (
   [ValidateNotNull()]
   [ValidateLength(1, [int]::MaxValue)]
   [string]
-  $dist
+  $dir
 )
 
 # Function to log start of a operation.
@@ -18,14 +18,8 @@ Function Step-Log($message) {
 
 # Function to log result of a operation.
 Function Add-Log($mark, $subject, $message) {
-  if ($mark -eq $tick) {
+  $code = if ($mark -eq $cross) { "31" } else { "32" }
-    printf "\033[32;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" $mark $subject $message
+  printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" $code $mark $subject $message
-  } 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($env:fail_fast -eq 'true') {
-      exit 1;
-    }
-  }
 }
 
 # Function to add a line to a powershell profile safely.
@@ -70,20 +64,6 @@ Function Add-Path {
   Get-PathFromRegistry
 }
 
-# Function to make sure printf is in PATH.
-Function Add-Printf {
-  if (-not(Test-Path "C:\Program Files\Git\usr\bin\printf.exe")) {
-    if(Test-Path "C:\msys64\usr\bin\printf.exe") {
-      New-Item -Path $bin_dir\printf.exe -ItemType SymbolicLink -Value C:\msys64\usr\bin\printf.exe
-    } else {
-      Invoke-WebRequest -Uri "$github/shivammathur/printf/releases/latest/download/printf-x64.zip" -OutFile "$bin_dir\printf.zip"
-      Expand-Archive -Path $bin_dir\printf.zip -DestinationPath $bin_dir -Force
-    }
-  } else {
-    New-Item -Path $bin_dir\printf.exe -ItemType SymbolicLink -Value "C:\Program Files\Git\usr\bin\printf.exe"
-  }
-}
-
 # Function to get a clean Powershell profile.
 Function Get-CleanPSProfile {
   if(-not(Test-Path -LiteralPath $profile)) {
@@ -93,24 +73,18 @@ Function Get-CleanPSProfile {
   Add-ToProfile $profile $current_profile.replace('\', '\\') ". $current_profile"
 }
 
-# Function to install a powershell package from GitHub.
+# Function to install PhpManager.
-Function Install-PSPackage() {
+Function Install-PhpManager() {
-  param(
+  $repo = "mlocati/powershell-phpmanager"
-    [Parameter(Position = 0, Mandatory = $true)]
+  $tag = (Invoke-RestMethod https://api.github.com/repos/$repo/tags)[0].Name
-    $package,
+  $module_path = "$bin_dir\PhpManager\powershell-phpmanager-$tag\PhpManager\PhpManager.psm1"
-    [Parameter(Position = 1, Mandatory = $true)]
-    $psm1_path,
-    [Parameter(Position = 2, Mandatory = $true)]
-    $url
-  )
-  $module_path = "$bin_dir\$psm1_path.psm1"
   if(-not (Test-Path $module_path -PathType Leaf)) {
-    $zip_file = "$bin_dir\$package.zip"
+    $zip_file = "$bin_dir\PhpManager.zip"
-    Invoke-WebRequest -Uri $url -OutFile $zip_file
+    Invoke-WebRequest -UseBasicParsing -Uri https://github.com/$repo/archive/$tag.zip -OutFile $zip_file
-    Expand-Archive -Path $zip_file -DestinationPath $bin_dir -Force
+    Expand-Archive -Path $zip_file -DestinationPath $bin_dir\PhpManager -Force
   }
   Import-Module $module_path
-  Add-ToProfile $current_profile "$package-search" "Import-Module $module_path"
+  Add-ToProfile $current_profile 'powershell-phpmanager' "Import-Module $module_path"
 }
 
 # Function to add PHP extensions.
@@ -201,37 +175,13 @@ Function Edit-ComposerConfig() {
     Add-Log "$cross" "composer" "Could not download composer"
     exit 1;
   }
-  if (-not(Test-Path $composer_json)) {
+  composer -q global config process-timeout 0
-    Set-Content -Path $composer_json -Value "{}"
+  Write-Output "::add-path::$env:APPDATA\Composer\vendor\bin"
-  }
-  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 config -g github-oauth.github.com $env:COMPOSER_TOKEN
+    composer -q global config github-oauth.github.com $env:COMPOSER_TOKEN
   }
 }
 
-# Function to extract tool version.
-Function Get-ToolVersion() {
-  Param (
-      [Parameter(Position = 0, Mandatory = $true)]
-      $tool,
-      [Parameter(Position = 1, Mandatory = $true)]
-      $param
-  )
-  $version_regex = "[0-9]+((\.{1}[0-9]+)+)(\.{0})(-[a-z0-9]+){0,1}"
-  if($tool -eq 'composer') {
-    if ($param -eq 'snapshot') {
-      $composer_version = (Select-String -Pattern "const\sBRANCH_ALIAS_VERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern $version_regex | ForEach-Object { $_.matches.Value }) + '+' + (Select-String -Pattern "const\sVERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern "[a-zA-Z0-9]+" -AllMatches | ForEach-Object { $_.matches[2].Value })
-    } else {
-      $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 }
-}
-
 # Function to add tools.
 Function Add-Tool() {
   Param (
@@ -240,42 +190,43 @@ Function Add-Tool() {
     $url,
     [Parameter(Position = 1, Mandatory = $true)]
     [ValidateNotNull()]
-    $tool,
+    [ValidateLength(1, [int]::MaxValue)]
-    [Parameter(Position = 2, Mandatory = $true)]
+    [string]
-    [ValidateNotNull()]
+    $tool
-    $ver_param
   )
   if (Test-Path $bin_dir\$tool) {
     Remove-Item $bin_dir\$tool
   }
-  if($url.Count -gt 1) {
+  if($url.Count -gt 1) { $url = $url[0] }
-    $url = $url[0]
+  if ($tool -eq "symfony") {
+    Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $bin_dir\$tool.exe
+    Add-ToProfile $current_profile $tool "New-Alias $tool $bin_dir\$tool.exe" >$null 2>&1
+  } else {
+    try {
+      Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $bin_dir\$tool
+      $bat_content = @()
+      $bat_content += "@ECHO off"
+      $bat_content += "setlocal DISABLEDELAYEDEXPANSION"
+      $bat_content += "SET BIN_TARGET=%~dp0/" + $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
+    } catch { }
   }
-  $tool_path = "$bin_dir\$tool"
+  if($tool -eq "phan") {
-  if (($url | Split-Path -Extension) -eq ".exe") {
+    Add-Extension fileinfo >$null 2>&1
-    $tool_path = "$tool_path.exe"
+    Add-Extension ast >$null 2>&1
-  }
+  } elseif($tool -eq "phive") {
-  try {
+    Add-Extension xml >$null 2>&1
-    Invoke-WebRequest -Uri $url -OutFile $tool_path
+  } elseif($tool -eq "cs2pr") {
-  } catch {
+    (Get-Content $bin_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $bin_dir/cs2pr
-    if($url -match '.*github.com.*releases.*latest.*') {
+  } elseif($tool -eq "composer") {
-      try {
+    Edit-ComposerConfig $bin_dir\$tool
-        $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])
+  } elseif($tool -eq "wp-cli") {
-        Invoke-WebRequest -Uri $url -OutFile $tool_path
+    Copy-Item $bin_dir\wp-cli.bat -Destination $bin_dir\wp.bat
-      } catch { }
-    }
   }
   if (((Get-ChildItem -Path $bin_dir/* | Where-Object Name -Match "^$tool(.exe|.phar)*$").Count -gt 0)) {
-    $bat_content = @()
+    Add-Log $tick $tool "Added"
-    $bat_content += "@ECHO off"
-    $bat_content += "setlocal DISABLEDELAYEDEXPANSION"
-    $bat_content += "SET BIN_TARGET=%~dp0/" + $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
-    Add-ToolsHelper $tool
-    $tool_version = Get-ToolVersion $tool $ver_param
-    Add-Log $tick $tool "Added $tool $tool_version"
   } else {
     Add-Log $cross $tool "Could not add $tool"
   }
@@ -300,23 +251,9 @@ Function Add-Composertool() {
     [string]
     $prefix
   )
-  if($tool -match "prestissimo|composer-prefetcher" -and $composer_version.split('.')[0] -ne "1") {
+  composer -q global require $prefix$release 2>&1 | out-null
-    Write-Output "::warning:: Skipping $tool, as it does not support Composer $composer_version. Specify composer:v1 in tools to use $tool"
+  if($?) {
-    Add-Log $cross $tool "Skipped"
+    Add-Log $tick $tool "Added"
-    Return
-  }
-  if(Test-Path $composer_lock) {
-    Remove-Item -Path $composer_lock -Force
-  }
-  composer global require $prefix$release >$null 2>&1
-  $json = findstr $prefix$tool $env:APPDATA\Composer\composer.json
-  if(Test-Path $composer_bin\composer) {
-    Copy-Item -Path "$bin_dir\composer" -Destination "$composer_bin\composer" -Force
-  }
-  Add-ToolsHelper $tool
-  if($json) {
-    $tool_version = Get-ToolVersion "Write-Output" "$json"
-    Add-Log $tick $tool "Added $tool $tool_version"
   } else {
     Add-Log $cross $tool "Could not setup $tool"
   }
@@ -333,27 +270,23 @@ $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'
-$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'
-$jit_versions = '8.[0-9]'
+$master_version = '8.0'
-$nightly_versions = '8.[1-9]'
 $cert_source='CurrentUser'
-$enable_extensions = ('openssl', 'curl', 'mbstring')
 
 $arch = 'x64'
+$arch_name ='amd64'
 if(-not([Environment]::Is64BitOperatingSystem) -or $version -lt '7.0') {
   $arch = 'x86'
+  $arch_name = '386'
 }
 
 $ts = $env:PHPTS -eq 'ts'
 if($env:PHPTS -ne 'ts') {
   $env:PHPTS = 'nts'
 }
+
 if($env:RUNNER -eq 'self-hosted') {
   $bin_dir = 'C:\tools\bin'
   $php_dir = "$php_dir$version"
@@ -362,6 +295,10 @@ if($env:RUNNER -eq 'self-hosted') {
   Get-CleanPSProfile >$null 2>&1
   New-Item $bin_dir -Type Directory 2>&1 | Out-Null
   Add-Path -PathItem $bin_dir
+  if(-not(Test-Path $bin_dir\printf.exe)) {
+    Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/shivammathur/printf/releases/latest/download/printf-$arch.zip" -OutFile "$bin_dir\printf.zip" >$null 2>&1
+    Expand-Archive -Path $bin_dir\printf.zip -DestinationPath $bin_dir -Force >$null 2>&1
+  }
   if($version -lt 5.6) {
     Add-Log $cross "PHP" "PHP $version is not supported on self-hosted runner"
     Start-Sleep 1
@@ -379,12 +316,8 @@ if($env:RUNNER -eq 'self-hosted') {
     New-Item -Path $current_profile -ItemType "file" -Force >$null 2>&1
   }
 }
-
-. $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-PhpManager >$null 2>&1
 Add-Log $tick "PhpManager" "Installed"
 
 Step-Log "Setup PHP"
@@ -397,20 +330,16 @@ 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-Module -Name VcRedist -Force
+  }
+  if ($version -eq $master_version) {
+    $version = 'master'
+    Invoke-WebRequest -UseBasicParsing -Uri https://dl.bintray.com/shivammathur/php/Install-PhpMaster.ps1 -OutFile $php_dir\Install-PhpMaster.ps1 > $null 2>&1
+    & $php_dir\Install-PhpMaster.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir
+  } else {
+    Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force > $null 2>&1
   }
-  try {
-    if ($version -match $nightly_versions) {
-      Invoke-WebRequest -UseBasicParsing -Uri https://github.com/shivammathur/php-builder-windows/releases/latest/download/Get-PhpNightly.ps1 -OutFile $php_dir\Get-PhpNightly.ps1 > $null 2>&1
-      & $php_dir\Get-PhpNightly.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir > $null 2>&1
-    } else {
-      Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force > $null 2>&1
-    }
-  } catch { }
 } else {
-  if($version -match $jit_versions) {
-    ('opcache.enable=1', 'opcache.jit_buffer_size=256M', 'opcache.jit=1235') | ForEach-Object { $p=$_.split('='); Set-PhpIniKey -Key $p[0] -Value $p[1] -Path $php_dir }
-  }
   if($env:update -eq 'true') {
     Update-Php $php_dir >$null 2>&1
     $status = "Updated to"
@@ -420,22 +349,15 @@ if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version
 }
 
 $installed = Get-Php -Path $php_dir
-if($installed.MajorMinorVersion -ne $version) {
+Set-PhpIniKey -Key 'date.timezone' -Value 'UTC' -Path $php_dir
-  Add-Log $cross "PHP" "Could not setup PHP $version"
+Set-PhpIniKey -Key 'memory_limit' -Value '-1' -Path $php_dir
-  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-Object { Invoke-WebRequest -Uri $bintray/$_ -OutFile $php_dir\$_ >$null 2>&1 }
+  ForEach($lib in "libeay32.dll", "ssleay32.dll") {
+    Invoke-WebRequest -UseBasicParsing -Uri https://dl.bintray.com/shivammathur/php/$lib -OutFile $php_dir\$lib >$null 2>&1
+  }
+  Enable-PhpExtension -Extension openssl, curl, mbstring -Path $php_dir
 } else {
-  $enable_extensions += ('opcache')
+  Enable-PhpExtension -Extension openssl, curl, opcache, mbstring -Path $php_dir
 }
-# Patch till there is a pcov DLL for PHP 8.0 on pecl
-if ($version -eq '8.0') {
-  Invoke-WebRequest -Uri "https://github.com/shivammathur/php-extensions-windows/releases/latest/download/php$version`_$env:PHPTS`_$arch`_pcov.dll" -OutFile $php_dir"\ext\php`_pcov.dll"
-}
-Enable-PhpExtension -Extension $enable_extensions -Path $php_dir
 Update-PhpCAInfo -Path $php_dir -Source $cert_source
-Copy-Item -Path $dist\..\src\configs\*.json -Destination $env:RUNNER_TOOL_CACHE
-New-Item -ItemType Directory -Path $composer_bin -Force 2>&1 | Out-Null
 Add-Log $tick "PHP" "$status PHP $($installed.FullVersion)"

src/tools.ts

@@ -1,4 +1,32 @@
 import * as utils from './utils';
+import * as httpm from '@actions/http-client';
+import {IHttpClientResponse as hcr} from '@actions/http-client/interfaces';
+import * as path from 'path';
+
+/**
+ * Function to get command to setup tools
+ *
+ * @param os_version
+ * @param suffix
+ */
+export async function getCommand(
+  os_version: string,
+  suffix: string
+): Promise<string> {
+  switch (os_version) {
+    case 'linux':
+    case 'darwin':
+      return 'add_' + suffix + ' ';
+    case 'win32':
+      return 'Add-' + suffix.charAt(0).toUpperCase() + suffix.slice(1) + ' ';
+    default:
+      return await utils.log(
+        'Platform ' + os_version + ' is not supported',
+        os_version,
+        'error'
+      );
+  }
+}
 
 /**
  * Function to get tool version
@@ -77,46 +105,106 @@ export async function getUri(
 }
 
 /**
- * Helper function to get script to setup phive
+ * 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 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 (
-        (await utils.getCommand(os_version, 'tool')) +
+        (await getCommand(os_version, 'tool')) +
-        'https://phar.io/releases/phive.phar phive status'
+        'https://phar.io/releases/phive.phar phive'
       );
     default:
       return (
-        (await utils.getCommand(os_version, 'tool')) +
+        (await getCommand(os_version, 'tool')) +
         'https://github.com/phar-io/phive/releases/download/' +
         version +
         '/phive-' +
         version +
-        '.phar phive status'
+        '.phar phive'
       );
   }
 }
@@ -143,31 +231,6 @@ export async function getPharUrl(
   }
 }
 
-/**
- * Function to get blackfire player url for a PHP version.
- *
- * @param version
- * @param php_version
- */
-export async function getBlackfirePlayerUrl(
-  version: string,
-  php_version: string
-): Promise<string> {
-  switch (true) {
-    case /5\.[5-6]|7\.0/.test(php_version) && version == 'latest':
-      version = '1.9.3';
-      break;
-    default:
-      break;
-  }
-  return await getPharUrl(
-    'https://get.blackfire.io',
-    'blackfire-player',
-    'v',
-    version
-  );
-}
-
 /**
  * Function to get the Deployer url
  *
@@ -245,15 +308,15 @@ export async function getWpCliUrl(version: string): Promise<string> {
  */
 export async function addComposer(tools_list: string[]): Promise<string[]> {
   const regex_any = /^composer($|:.*)/;
-  const regex_valid = /^composer:?($|preview$|snapshot$|v?[1-2]$|v?\d+\.\d+\.\d+[\w-]*$)/;
+  const regex_valid = /^composer:?($|preview$|snapshot$|v?[1-2]$)/;
   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) {
+  switch (matches[0]) {
-    case matches[0] == undefined:
+    case undefined:
       break;
     default:
-      composer = matches[matches.length - 1].replace(/v(\d\S*)/, '$1');
+      composer = matches[matches.length - 1].replace(/v([1-2])/, '$1');
       break;
   }
   tools_list.unshift(composer);
@@ -266,20 +329,27 @@ export async function addComposer(tools_list: string[]): Promise<string[]> {
  * @param version
  */
 export async function getComposerUrl(version: string): Promise<string> {
-  let cache_url = `https://github.com/shivammathur/composer-cache/releases/latest/download/composer-${version.replace(
+  const cache_url =
-    'latest',
+    'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-' +
-    'stable'
+    version.replace('latest', 'stable') +
-  )}.phar`;
+    '.phar,';
-  switch (true) {
+  const getComposerUrlHelper = async function (
-    case /^snapshot$/.test(version):
+    version: string
-      return `${cache_url},https://getcomposer.org/composer.phar`;
+  ): Promise<string> {
-    case /^preview$|^[1-2]$/.test(version):
+    const client: httpm.HttpClient = new httpm.HttpClient('setup-php');
-      return `${cache_url},https://getcomposer.org/composer-${version}.phar`;
+    const response: hcr = await client.get('https://getcomposer.org/versions');
-    case /^\d+\.\d+\.\d+[\w-]*$/.test(version):
+    const data = JSON.parse(await response.readBody());
-      cache_url = `https://github.com/composer/composer/releases/download/${version}/composer.phar`;
+    return cache_url + 'https://getcomposer.org' + data[version][0]['path'];
-      return `${cache_url},https://getcomposer.org/composer-${version}.phar`;
+  };
+  switch (version) {
+    case 'snapshot':
+      return cache_url + 'https://getcomposer.org/composer.phar';
+    case 'preview':
+    case '1':
+    case '2':
+      return await getComposerUrlHelper(version);
     default:
-      return `${cache_url},https://getcomposer.org/composer-stable.phar`;
+      return cache_url + 'https://getcomposer.org/composer-stable.phar';
   }
 }
 
@@ -298,7 +368,7 @@ export async function getCleanedToolsList(
       return extension
         .trim()
         .replace(
-          /-agent|behat\/|codeception\/|hirak\/|icanhazstring\/|laravel\/|narrowspark\/automatic-|overtrue\/|phpspec\/|robmorgan\/|symfony\//,
+          /-agent|hirak\/|laravel\/|narrowspark\/automatic-|overtrue\/|robmorgan\/|symfony\//,
           ''
         );
     })
@@ -310,20 +380,17 @@ export async function getCleanedToolsList(
  * Helper function to get script to setup a tool using a phar url
  *
  * @param tool
+ * @param version
  * @param url
  * @param os_version
- * @param ver_param
  */
 export async function addArchive(
   tool: string,
+  version: string,
   url: string,
-  os_version: string,
+  os_version: string
-  ver_param: string
 ): Promise<string> {
-  return (
+  return (await getCommand(os_version, 'tool')) + url + ' ' + tool;
-    (await utils.getCommand(os_version, 'tool')) +
-    (await utils.joins(url, tool, ver_param))
-  );
 }
 
 /**
@@ -338,11 +405,16 @@ export async function addDevTools(
 ): Promise<string> {
   switch (os_version) {
     case 'linux':
+      return (
+        'add_devtools' +
+        '\n' +
+        (await utils.addLog('$tick', tool, 'Added', 'linux'))
+      );
     case 'darwin':
-      return 'add_devtools ' + tool;
+      return await utils.addLog('$tick', tool, 'Added', 'darwin');
     case 'win32':
       return await utils.addLog(
-        '$tick',
+        '$cross',
         tool,
         tool + ' is not a windows tool',
         'win32'
@@ -370,10 +442,31 @@ export async function addPackage(
   prefix: string,
   os_version: string
 ): Promise<string> {
-  const tool_command = await utils.getCommand(os_version, 'composertool');
+  const tool_command = await getCommand(os_version, 'composertool');
   return tool_command + tool + ' ' + release + ' ' + prefix;
 }
 
+/**
+ * Function to get script to add tools with custom support.
+ *
+ * @param tool
+ * @param version
+ * @param os_version
+ */
+export async function addCustomTool(
+  tool: string,
+  version: string,
+  os_version: string
+): Promise<string> {
+  const script_extension: string = await utils.scriptExtension(os_version);
+  const script: string = path.join(
+    __dirname,
+    '../src/scripts/tools/' + tool + script_extension
+  );
+  const command: string = await getCommand(os_version, tool);
+  return '. ' + script + '\n' + command + version;
+}
+
 /**
  * Setup tools
  *
@@ -407,25 +500,26 @@ export async function addTools(
       case 'blackfire':
       case 'grpc_php_plugin':
       case 'protoc':
-        script += await utils.customPackage(tool, 'tools', version, os_version);
+        script += await addCustomTool(tool, version, os_version);
-        break;
-      case 'behat':
-      case 'codeception':
-      case 'phpspec':
-        script += await addPackage(tool, release, tool + '/', os_version);
         break;
       case 'blackfire-player':
-        url = await getBlackfirePlayerUrl(version, php_version);
+        url = await getPharUrl('https://get.blackfire.io', tool, 'v', version);
-        script += await addArchive(tool, url, os_version, '"-V"');
+        script += await addArchive(tool, version, url, os_version);
+        break;
+      case 'codeception':
+        url =
+          'https://codeception.com/' +
+          (await getCodeceptionUri(version, php_version));
+        script += await addArchive(tool, version, url, os_version);
         break;
       case 'composer':
         url = await getComposerUrl(version);
-        script += await addArchive('composer', url, os_version, version);
+        script += await addArchive('composer', version, url, os_version);
         break;
       case 'composer-normalize':
         uri = await getUri(tool, '.phar', version, 'releases', '', 'download');
         url = github + 'ergebnis/composer-normalize/' + uri;
-        script += await addArchive(tool, url, os_version, '"-V"');
+        script += await addArchive(tool, version, url, os_version);
         break;
       case 'composer-prefetcher':
         script += await addPackage(
@@ -438,43 +532,41 @@ export async function addTools(
       case 'composer-require-checker':
         uri = await getUri(tool, '.phar', version, 'releases', '', 'download');
         url = github + 'maglnet/ComposerRequireChecker/' + uri;
-        script += await addArchive(tool, url, os_version, '"-V"');
+        script += await addArchive(tool, version, url, os_version);
         break;
       case 'composer-unused':
-        script += await addPackage(tool, release, 'icanhazstring/', os_version);
+        uri = await getUri(tool, '.phar', version, 'releases', '', 'download');
+        url = github + 'composer-unused/composer-unused/' + uri;
+        script += await addArchive(tool, version, url, os_version);
         break;
       case 'cs2pr':
         uri = await getUri(tool, '', version, 'releases', '', 'download');
         url = github + 'staabm/annotate-pull-request-from-checkstyle/' + uri;
-        script += await addArchive(tool, url, os_version, '"-V"');
+        script += await addArchive(tool, version, url, os_version);
         break;
       case 'deployer':
         url = await getDeployerUrl(version);
-        script += await addArchive(tool, url, os_version, '"-V"');
+        script += await addArchive(tool, version, url, os_version);
         break;
       case 'flex':
         script += await addPackage(tool, release, 'symfony/', os_version);
         break;
       case 'infection':
         url = github + 'infection/infection/' + uri;
-        script += await addArchive(tool, url, os_version, '"-V"');
+        script += await addArchive(tool, version, url, os_version);
         break;
       case 'pecl':
-        script += await utils.getCommand(os_version, 'pecl');
+        script += await getCommand(os_version, 'pecl');
         break;
       case 'phan':
         url = github + 'phan/phan/' + uri;
-        script += await addArchive(tool, url, os_version, '"-v"');
+        script += await addArchive(tool, version, url, os_version);
-        break;
-      case 'phing':
-        url = 'https://www.phing.info/get/phing-' + version + '.phar';
-        script += await addArchive(tool, url, os_version, '"-v"');
         break;
       case 'phinx':
         script += await addPackage(tool, release, 'robmorgan/', os_version);
         break;
       case 'phive':
-        script += await addPhive(version, php_version, os_version);
+        script += await addPhive(version, os_version);
         break;
       case 'php-config':
       case 'phpize':
@@ -483,55 +575,48 @@ export async function addTools(
       case 'php-cs-fixer':
         uri = await getUri(tool, '.phar', version, 'releases', 'v', 'download');
         url = github + 'FriendsOfPHP/PHP-CS-Fixer/' + uri;
-        script += await addArchive(tool, url, os_version, '"-V"');
+        script += await addArchive(tool, version, url, os_version);
         break;
       case 'phpcbf':
       case 'phpcs':
         url = github + 'squizlabs/PHP_CodeSniffer/' + uri;
-        script += await addArchive(tool, url, os_version, '"--version"');
+        script += await addArchive(tool, version, url, os_version);
         break;
       case 'phpcpd':
       case 'phpunit':
         url = await getPharUrl('https://phar.phpunit.de', tool, '', version);
-        script += await addArchive(tool, url, os_version, '"--version"');
+        script += await addArchive(tool, version, url, os_version);
         break;
       case 'phplint':
         script += await addPackage(tool, release, 'overtrue/', os_version);
         break;
       case 'phpmd':
         url = github + 'phpmd/phpmd/' + uri;
-        script += await addArchive(tool, url, os_version, '"--version"');
+        script += await addArchive(tool, version, url, os_version);
         break;
       case 'phpstan':
         url = github + 'phpstan/phpstan/' + uri;
-        script += await addArchive(tool, url, os_version, '"-V"');
+        script += await addArchive(tool, version, url, os_version);
         break;
       case 'prestissimo':
         script += await addPackage(tool, release, 'hirak/', os_version);
         break;
       case 'psalm':
         url = github + 'vimeo/psalm/' + uri;
-        script += await addArchive(tool, url, os_version, '"-v"');
+        script += await addArchive(tool, version, url, os_version);
         break;
       case 'symfony':
       case 'symfony-cli':
         uri = await getSymfonyUri(version, os_version);
         url = github + 'symfony/cli/' + uri;
-        script += await addArchive('symfony', url, os_version, 'version');
+        script += await addArchive('symfony', version, url, os_version);
         break;
       case 'vapor-cli':
-      case 'vapor':
+        script += await addPackage(tool, release, 'laravel/', os_version);
-        script += await addPackage(
-          'vapor-cli',
-          release,
-          'laravel/',
-          os_version
-        );
         break;
-      case 'wp':
       case 'wp-cli':
         url = github + (await getWpCliUrl(version));
-        script += await addArchive('wp-cli', url, os_version, '"--version"');
+        script += await addArchive(tool, version, url, os_version);
         break;
       default:
         script += await utils.addLog(

src/utils.ts

@@ -1,24 +1,7 @@
-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';
 
-/**
- * Function to read environment variable and return a string value.
- *
- * @param property
- */
-export async function readEnv(property: string): Promise<string> {
-  const value = process.env[property];
-  switch (value) {
-    case undefined:
-      return '';
-    default:
-      return value;
-  }
-}
-
 /**
  * Function to get inputs from both with and env annotations.
  *
@@ -29,56 +12,13 @@ export async function getInput(
   name: string,
   mandatory: boolean
 ): Promise<string> {
-  const input = core.getInput(name);
+  const input = process.env[name];
-  const env_input = await readEnv(name);
+  switch (input) {
-  switch (true) {
+    case '':
-    case input != '':
+    case undefined:
+      return core.getInput(name, {required: mandatory});
+    default:
       return input;
-    case input == '' && env_input != '':
-      return env_input;
-    case input == '' && env_input == '' && mandatory:
-      throw new Error(`Input required and not supplied: ${name}`);
-    default:
-      return '';
-  }
-}
-
-/**
- * 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> {
-  const manifest =
-    'https://raw.githubusercontent.com/shivammathur/setup-php/develop/src/configs/php-versions.json';
-  switch (true) {
-    case /^(latest|\d+\.x)$/.test(version):
-      return JSON.parse(await fetch(manifest))[version];
-    default:
-      switch (true) {
-        case version.length > 1:
-          return version.slice(0, 3);
-        default:
-          return version + '.0';
-      }
   }
 }
 
@@ -234,23 +174,24 @@ export async function writeScript(
 /**
  * Function to break extension csv into an array
  *
- * @param package_csv
+ * @param extension_csv
  */
-export async function packageArray(
+export async function extensionArray(
-  package_csv: string
+  extension_csv: string
 ): Promise<Array<string>> {
-  switch (package_csv) {
+  switch (extension_csv) {
     case '':
     case ' ':
       return [];
     default:
-      return package_csv
+      return extension_csv
         .split(',')
-        .map(function (package_name: string) {
+        .map(function (extension: string) {
-          return package_name
+          return extension
             .trim()
             .toLowerCase()
-            .replace(/^php[-_]/, '');
+            .replace('php-', '')
+            .replace('php_', '');
         })
         .filter(Boolean);
   }
@@ -269,12 +210,9 @@ export async function CSVArray(values_csv: string): Promise<Array<string>> {
       return [];
     default:
       return values_csv
-        .split(/,(?=(?:(?:[^"']*["']){2})*[^"']*$)/)
+        .split(',')
-        .map(function (value) {
+        .map(function (value: string) {
-          return value
+          return value.trim();
-            .trim()
-            .replace(/^["']|["']$|(?<==)["']/g, '')
-            .replace(/=(((?!E_).)*[?{}|&~![()^]+((?!E_).)+)/, "='$1'");
         })
         .filter(Boolean);
   }
@@ -286,11 +224,18 @@ export async function CSVArray(values_csv: string): Promise<Array<string>> {
  * @param extension
  */
 export async function getExtensionPrefix(extension: string): Promise<string> {
-  switch (true) {
+  const zend: Array<string> = [
+    'xdebug',
+    'xdebug3',
+    'opcache',
+    'ioncube',
+    'eaccelerator'
+  ];
+  switch (zend.indexOf(extension)) {
     default:
-      return 'extension';
-    case /xdebug([2-3])?$|opcache|ioncube|eaccelerator/.test(extension):
       return 'zend_extension';
+    case -1:
+      return 'extension';
   }
 }
 
@@ -339,31 +284,6 @@ export async function getUnsupportedLog(
   );
 }
 
-/**
- * Function to get command to setup tools
- *
- * @param os_version
- * @param suffix
- */
-export async function getCommand(
-  os_version: string,
-  suffix: string
-): Promise<string> {
-  switch (os_version) {
-    case 'linux':
-    case 'darwin':
-      return 'add_' + suffix + ' ';
-    case 'win32':
-      return 'Add-' + suffix.charAt(0).toUpperCase() + suffix.slice(1) + ' ';
-    default:
-      return await log(
-        'Platform ' + os_version + ' is not supported',
-        os_version,
-        'error'
-      );
-  }
-}
-
 /**
  * Function to join strings with space
  *
@@ -393,48 +313,3 @@ export async function scriptExtension(os_version: string): Promise<string> {
       );
   }
 }
-
-/**
- * Function to get script tool
- *
- * @param os_version
- */
-export async function scriptTool(os_version: string): Promise<string> {
-  switch (os_version) {
-    case 'win32':
-      return 'pwsh';
-    case 'linux':
-    case 'darwin':
-      return 'bash';
-    default:
-      return await log(
-        'Platform ' + os_version + ' is not supported',
-        os_version,
-        'error'
-      );
-  }
-}
-
-/**
- * Function to get script to add tools with custom support.
- *
- * @param pkg
- * @param type
- * @param version
- * @param os_version
- */
-export async function customPackage(
-  pkg: string,
-  type: string,
-  version: string,
-  os_version: string
-): Promise<string> {
-  const pkg_name: string = pkg.replace(/\d+|(pdo|pecl)[_-]/, '');
-  const script_extension: string = await scriptExtension(os_version);
-  const script: string = path.join(
-    __dirname,
-    '../src/scripts/' + type + '/' + pkg_name + script_extension
-  );
-  const command: string = await getCommand(os_version, pkg_name);
-  return '\n. ' + script + '\n' + command + version;
-}