v1 maintenance release - 1.8.4

.eslintrc.json

@@ -17,6 +17,7 @@
     "camelcase": "off",
     "require-atomic-updates": "off",
     "@typescript-eslint/ban-ts-ignore": "off",
-    "@typescript-eslint/camelcase": "off"
+    "@typescript-eslint/camelcase": "off",
+    "@typescript-eslint/no-unused-vars": "off"
   }
 }

.github/CONTRIBUTING.md

@@ -9,12 +9,11 @@ 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. 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.
-* Send a pull request to the develop branch with all the details.
 
 Please make sure that you have [set up your user name and email address](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup) for use with Git. Strings such as `silly nick name <root@localhost>` look really stupid in the commit history of a project.
 
-Due to time constraints, you may not always get a quick response. Please do not take delays personally and feel free to remind.
+Due to time constraints, you may not always get a quick response. Please do not take delays personal and feel free to remind.
 
 ## Coding Guidelines
 

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,37 +1,23 @@
 ---
 name: Bug report
-about: Nice, you found a bug!
+about: Create a report to help us improve
 title: ''
-labels: t:bug
+labels: ''
-assignees: 'shivammathur'
+assignees: ''
 
 ---
 
 **Describe the bug**
-<!-- Please describe the bug concisely. -->
+A clear and concise description of what the bug is.
-
-**Runners**
-<!-- Please mark the GitHub Action runner your workflow uses. -->
-- [ ] GitHub Hosted
-- [ ] Self Hosted
-
-**Operating systems**
-<!-- Please mention the operating systems your workflow uses. -->
-
-**PHP versions**
-<!-- Please mention the PHP versions your workflow uses. -->
 
 **To Reproduce**
-<!-- Please provide the relevant steps of your workflow `.yml` file. -->
+Please provide the GitHub Action `.yml` file.
 
 **Expected behavior**
-<!-- A clear and concise description of what you expected to happen. -->
+A clear and concise description of what you expected to happen.
 
-**Screenshots/Logs**
+**Screenshots**
-<!-- If applicable, add screenshots or logs to help explain your problem. -->
+If applicable, add screenshots to help explain your problem.
 
 **Additional context**
-<!-- Add any other context about the problem here. -->
+Add any other context about the problem here.
-
-**Are you willing to submit a PR?**
-<!-- We accept pull requests targeting the develop branch. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,23 +1,20 @@
 ---
 name: Feature request
-about: Suggest a new feature
+about: Suggest an idea for this project
 title: ''
-labels: t:enhancement
+labels: ''
-assignees: 'shivammathur'
+assignees: ''
 
 ---
 
-**Describe the feature**
+**Is your feature request related to a problem? Please describe.**
-<!-- Please describe concisely the feature you want to add. -->
+A clear and concise description of what the problem is. Ex. I want to improve [...]
 
-**Underlying issue**
+**Describe the solution you'd like**
-<!-- Please describe the issue this would solve. -->
+A clear and concise description of what you want to happen.
 
-**Describe alternatives**
+**Describe alternatives you've considered**
-<!-- Please mention any alternative solutions you've considered. -->
+A clear and concise description of any alternative solutions or features you've considered.
 
 **Additional context**
-<!-- Add any other context or screenshots about the feature request here. -->
+Add any other context or screenshots about the feature request here.
-
-**Are you willing to submit a PR?**
-<!-- We accept pull requests targeting the develop branch. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,13 +7,14 @@ labels: bug or enhancement
 
 ## 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 Issues,
+> We wish to have discussions in Issues. A single issue may be targeted by multiple PRs.
-> so that the development can be pointed in the intended direction.
+> If you're offering a new feature or fixing anything, we'd like to know beforehand in Issues,
+> and potentially we'll be able to point development in a particular direction.
 
-Related issue: <!-- Please link the related issue -->
+Related issue: 
 
 > Further notes in [Contribution Guidelines](.github/CONTRIBUTING.md)
-> Thank you for your contribution.
+> Thank you! We are open to PRs, but please understand if for technical reasons we are unable to accept each and any PR
 
 ### Description
 
@@ -25,12 +26,7 @@ This PR [briefly explain what it does]
 - [ ] I have run `npm run format` before the commit.
 - [ ] I have run `npm run lint` before the commit.
 - [ ] I have run `npm run release` before the commit.
-- [ ] `npm test` returns with no unit test errors and all code covered.
+- [ ] `npm test` returns with no unit test errors.
-
-> 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 link).
 
 <!--
 - Please target the develop branch when submitting the pull request.

.github/PULL_REQUEST_TEMPLATE/FIX.md

@@ -7,13 +7,14 @@ labels: bug
 
 ## A Pull Request should be associated with an Issue.
 
-> If you're offering a new feature or fixing anything, please provide the details in Issues,
+> We wish to have discussions in Issues. A single issue may be targeted by multiple PRs.
-> so that the development can be pointed in the intended direction.
+> If you're offering a new feature or fixing anything, we'd like to know beforehand in Issues,
+> and potentially we'll be able to point development in a particular direction.
 
-Related issue: <!-- Please link the related issue -->
+Related issue: 
 
 > Further notes in [Contribution Guidelines](.github/CONTRIBUTING.md)
-> Thank you for your contribution.
+> Thank you! We are open to PRs, but please understand if for technical reasons we are unable to accept each and any PR
 
 ### Description
 
@@ -25,12 +26,7 @@ This PR [briefly explain what it does]
 - [ ] I have run `npm run format` before the commit.
 - [ ] I have run `npm run lint` before the commit.
 - [ ] I have run `npm run release` before the commit.
-- [ ] `npm test` returns with no unit test errors and all code covered.
+- [ ] `npm test` returns with no unit test errors.
-
-> 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 link).
 
 <!--
 - Please target the develop branch when submitting the pull request.

.github/PULL_REQUEST_TEMPLATE/IMPROVEMENT.md

@@ -7,13 +7,14 @@ labels: enhancement
 
 ## A Pull Request should be associated with an Issue.
 
-> If you're improving a feature please provide the details in Issues,
+> We wish to have discussions in Issues. A single issue may be targeted by multiple PRs.
-> so that the development can be pointed in the intended direction.
+> If you're offering a new feature or fixing anything, we'd like to know beforehand in Issues,
+> and potentially we'll be able to point development in a particular direction.
 
-Related issue: <!-- Please link the related issue -->
+Related issue: 
 
 > Further notes in [Contribution Guidelines](.github/CONTRIBUTING.md)
-> Thank you for your contribution.
+> Thank you! We are open to PRs, but please understand if for technical reasons we are unable to accept each and any PR
 
 ### Description
 
@@ -25,12 +26,7 @@ This PR [briefly explain what it does]
 - [ ] I have run `npm run format` before the commit.
 - [ ] I have run `npm run lint` before the commit.
 - [ ] I have run `npm run release` before the commit.
-- [ ] `npm test` returns with no unit test errors and all code covered.
+- [ ] `npm test` returns with no unit test errors.
-
-> 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 link).
 
 <!--
 - Please target the develop branch when submitting the pull request.

.github/PULL_REQUEST_TEMPLATE/NEW_FEATURE.md

@@ -1,19 +1,20 @@
 ---
 name: 🎉 New Feature
-about: You have added a new feature to setup-php?
+about: You have implemented some neat idea that you want to make part of setup-php?
 labels: enhancement
 
 ---
 
 ## A Pull Request should be associated with an Issue.
 
-> If you're adding a new feature please provide the details in Issues,
+> We wish to have discussions in Issues. A single issue may be targeted by multiple PRs.
-> so that the development can be pointed in the intended direction.
+> If you're offering a new feature or fixing anything, we'd like to know beforehand in Issues,
+> and potentially we'll be able to point development in a particular direction.
 
-Related issue: <!-- Please link the related issue -->
+Related issue: 
 
 > Further notes in [Contribution Guidelines](.github/CONTRIBUTING.md)
-> Thank you for your contribution.
+> Thank you! We are open to PRs, but please understand if for technical reasons we are unable to accept each and any PR
 
 ### Description
 
@@ -25,12 +26,7 @@ This PR [briefly explain what it does]
 - [ ] I have run `npm run format` before the commit.
 - [ ] I have run `npm run lint` before the commit.
 - [ ] I have run `npm run release` before the commit.
-- [ ] `npm test` returns with no unit test errors and all code covered.
+- [ ] `npm test` returns with no unit test errors.
-
-> 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 link).
 
 <!--
 - Please target the develop branch when submitting the pull request.

.github/SECURITY.md

@@ -1,30 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-The following versions of this project are supported for security updates.
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 1.8.x   | :white_check_mark: |
-| 2.2.x   | :white_check_mark: |
-
-## Supported PHP Versions
-
-This security policy only applies to the latest patches of the following PHP versions.
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 7.2     | :white_check_mark: |
-| 7.3     | :white_check_mark: |
-| 7.4     | :white_check_mark: |
-| 8.0     | :white_check_mark: |
-
-## Reporting a Vulnerability
-
-If you have found any issues that might have security implications in the versions supported, please send a report privately to [contact@shivammathur.com](mailto:contact@shivammathur.com)
-Do not report security reports publicly.
-
-## Tidelift
-
-If you use this GitHub Action through a Tidelift subscription, please refer to [https://tidelift.com/security](https://tidelift.com/security).

.github/workflows/experimental-workflow.yml

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

.github/workflows/workflow.yml

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

.prettierrc.json

@@ -1,12 +1,11 @@
 {
-    "arrowParens": "avoid",
-    "bracketSpacing": false,
-    "endOfLine": "auto",
-    "parser": "typescript",
     "printWidth": 80,
+    "tabWidth": 2,
+    "useTabs": false,
     "semi": true,
     "singleQuote": true,
-    "tabWidth": 2,
     "trailingComma": "none",
-    "useTabs": false
+    "bracketSpacing": false,
-}
+    "arrowParens": "avoid",
+    "parser": "typescript"
+  }

README.md

@@ -10,7 +10,7 @@
   <a href="https://github.com/shivammathur/setup-php" title="GitHub action to setup PHP"><img alt="GitHub Actions status" src="https://github.com/shivammathur/setup-php/workflows/Main%20workflow/badge.svg"></a>
   <a href="https://codecov.io/gh/shivammathur/setup-php" title="Code coverage"><img alt="Codecov Code Coverage" src="https://codecov.io/gh/shivammathur/setup-php/branch/master/graph/badge.svg"></a>
   <a href="https://github.com/shivammathur/setup-php/blob/master/LICENSE" title="license"><img alt="LICENSE" src="https://img.shields.io/badge/license-MIT-428f7e.svg"></a>
-  <a href="#tada-php-support" title="PHP Versions Supported"><img alt="PHP Versions Supported" src="https://img.shields.io/badge/php-%3E%3D%205.3-8892BF.svg"></a>
+  <a href="#tada-php-support" title="PHP Versions Supported"><img alt="PHP Versions Supported" src="https://img.shields.io/badge/php-%3E%3D%205.6-8892BF.svg"></a>
 </p>
 
 Setup PHP with required extensions, php.ini configuration, code-coverage support and various tools like composer in [GitHub Actions](https://github.com/features/actions "GitHub Actions"). This action gives you a cross platform interface to setup the PHP environment you need to test your application. Refer to [Usage](#memo-usage "How to use this") section and [examples](#examples "Examples of use") to see how to use this.
@@ -24,43 +24,32 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
 - [Coverage support](#signal_strength-coverage-support)
   - [Xdebug](#xdebug)
   - [PCOV](#pcov)
-  - [Disable Coverage](#disable-coverage)
+  - [Disable coverage](#disable-coverage)
 - [Usage](#memo-usage)
-  - [Inputs](#inputs)
   - [Basic Setup](#basic-setup)
   - [Matrix Setup](#matrix-setup)
   - [Experimental Setup](#experimental-setup)
-  - [Self Hosted Setup](#self-hosted-setup)
-  - [Local Testing Setup](#local-testing-setup)
   - [Thread Safe Setup](#thread-safe-setup)  
-  - [Force Update](#force-update)
+  - [Cache dependencies](#cache-dependencies)
-  - [Verbose Setup](#verbose-setup)
-  - [Cache Extensions](#cache-extensions)
-  - [Cache Composer Dependencies](#cache-composer-dependencies)
-  - [Cache Node.js Dependencies](#cache-nodejs-dependencies)
-  - [Composer GitHub OAuth](#composer-github-oauth)
   - [Problem Matchers](#problem-matchers)
   - [Examples](#examples)
 - [License](#scroll-license)
 - [Contributions](#1-contributions)
-- [Support This Project](#sparkling_heart-support-this-project)
+- [Support this project](#sparkling_heart-support-this-project)
-- [Dependencies](#bookmark-dependencies)
+- [This action uses the following works](#bookmark-this-action-uses-the-following-works)
 - [Further Reading](#bookmark_tabs-further-reading)
 
 ## :tada: PHP Support
 
-|PHP Version|Stability|Release Support|Runner Support|
+|PHP Version|Stability|Release Support|
-|--- |--- |--- |--- |
+|--- |--- |--- |
-|`5.3`|`Stable`|`End of life`|`GitHub`|
+|5.6|`Stable`|`End of life`|
-|`5.4`|`Stable`|`End of life`|`GitHub`|
+|7.0|`Stable`|`End of life`|
-|`5.5`|`Stable`|`End of life`|`GitHub`|
+|7.1|`Stable`|`End of life`|
-|`5.6`|`Stable`|`End of life`|`GitHub`, `self-hosted`|
+|7.2|`Stable`|`Security fixes only`|
-|`7.0`|`Stable`|`End of life`|`GitHub`, `self-hosted`|
+|7.3|`Stable`|`Active`|
-|`7.1`|`Stable`|`End of life`|`GitHub`, `self-hosted`|
+|7.4|`Stable`|`Active`|
-|`7.2`|`Stable`|`Security fixes only`|`GitHub`, `self-hosted`|
+|8.0|`Experimental`|`In development`|
-|`7.3`|`Stable`|`Active`|`GitHub`, `self-hosted`|
-|`7.4`|`Stable`|`Active`|`GitHub`, `self-hosted`|
-|`8.0`|`Experimental`|`In development`|`GitHub`, `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 [experimental setup](#experimental-setup) for more information.
 
@@ -71,91 +60,44 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
 |Windows Server 2019|`windows-latest` or `windows-2019`|
 |Ubuntu 18.04|`ubuntu-latest` or `ubuntu-18.04`|
 |Ubuntu 16.04|`ubuntu-16.04`|
-|MacOS X Catalina 10.15|`macos-latest` or `macos-10.15`|
+|macOS X Catalina 10.15|`macos-latest` or `macOS-10.15`|
-|Self Hosted|`self-hosted`|
-
-**Note:** Refer to the [self-hosted setup](#self-hosted-setup) to use the action on self-hosted runners.
 
 ## :heavy_plus_sign: PHP Extension Support
-
+- On `ubuntu` by default extensions which are available as a package can be installed. If the extension is not available as a package but it is on `PECL`, it can be installed by specifying `pecl` in the tools input.
-- On `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 `windows` extensions which have `windows` binary on `PECL` can be installed.
-
+- On `macOS` extensions which are on `PECL` can be installed.
-```yaml
+- Extensions which are installed along with PHP if specified are enabled.
-uses: shivammathur/setup-php@v2
+- Extensions on `PECL` which do not have a latest stable version, their pre-release versions can be installed by suffixing the extension with its state i.e `alpha`, `beta`, `devel` or `snapshot` separated by a `-` like `msgpack-beta`.
-with:
+- Extensions which cannot be installed gracefully leave an error message in the logs, the action is not interrupted.
-  php-version: '7.4'
-  tools: pecl
-  extensions: swoole
-```
-
-- On `windows` PECL extensions which have the `DLL` binary can be installed.
-
-- On `macOS` PECL extensions can be installed.
-
-- Extensions installed along with PHP if specified are enabled.
-
-- Specific versions of PECL extensions can be installed by suffixing the version. This is useful for installing old versions of extensions which support end of life PHP versions.
-
-```yaml
-uses: shivammathur/setup-php@v2
-with:
-  php-version: '5.4'
-  tools: pecl
-  extensions: swoole-1.9.3
-```
-
-- Pre-release versions of PECL extensions can be setup by suffixing the extension with its state i.e `alpha`, `beta`, `devel` or `snapshot`.
-
-```yaml
-uses: shivammathur/setup-php@v2
-with:
-  php-version: '7.4'
-  tools: pecl
-  extensions: xdebug-beta
-```
-
-- Non-default extensions can be removed by prefixing it with a `:`.
-
-```yaml
-uses: shivammathur/setup-php@v2
-with:
-  php-version: '7.4'  
-  extensions: :opcache
-```
-
-- Extensions which cannot be added or removed gracefully leave an error message in the logs, the action is not interrupted.
-
-- These extensions have custom support - `gearman` on ubuntu, `blackfire`, `phalcon3` and `phalcon4` on all supported OS.
 
 ## :wrench: Tools Support
 
 These tools can be setup globally using the `tools` input.
 
-`blackfire`, `blackfire-player`, `codeception`, `composer`, `composer-prefetcher`, `cs2pr`, `deployer`, `flex`, `infection`, `pecl`, `phinx`, `phive`, `phpcbf`, `phpcpd`, `php-config`, `php-cs-fixer`, `phpcs`, `phpize`, `phpmd`, `phpstan`, `phpunit`, `prestissimo`, `psalm`, `symfony`, `vapor-cli`
+`codeception`, `composer`, `composer-prefetcher`, `cs2pr`, `deployer`, `pecl`, `phinx`, `phive`, `phpcbf`, `phpcpd`, `php-config`, `php-cs-fixer`, `phpcs`, `phpize`, `phpmd`, `phpstan`, `phpunit`, `prestissimo`, `psalm`, `symfony`
 
 ```yaml
-uses: shivammathur/setup-php@v2
+uses: shivammathur/setup-php@v1
 with:
   php-version: '7.4'
   tools: php-cs-fixer, phpunit
 ```
 
-To setup a particular version of a tool, specify it in this form `tool:version`.  
+To setup a particular version of a tool, specify it in the form `tool:version`.  
 Version should be in semver format and a valid release of the tool.
 
 ```yaml
-uses: shivammathur/setup-php@v2
+uses: shivammathur/setup-php@v1
 with:
   php-version: '7.4'
   tools: php-cs-fixer:2.15.5, phpunit:8.5.1
 ``` 
 
-**Notes**
+**Note**
 - `composer` is setup by default.
-- Specifying version for `composer` and `pecl` has no effect, latest versions of both tools which are compatible with the PHP version will be setup.
+- Specifying version for `composer` and `pecl` has no effect, latest version of both tools will be setup.
-- Both agent and client will be setup when `blackfire` is specified.
 - If the version specified for the tool is not in semver format, latest version of the tool will be setup.
-- Tools which cannot be setup gracefully leave an error message in the logs, the action is not interrupted.
+- Tools which cannot be installed gracefully leave an error message in the logs, the action is not interrupted.
 
 ## :signal_strength: Coverage support
 
@@ -165,7 +107,7 @@ Specify `coverage: xdebug` to use `Xdebug`.
 Runs on all [PHP versions supported](#tada-php-support "List of PHP versions supported on this GitHub Action") except `8.0`.
 
 ```yaml
-uses: shivammathur/setup-php@v2
+uses: shivammathur/setup-php@v1
 with:
   php-version: '7.4'
   coverage: xdebug
@@ -178,26 +120,26 @@ It is much faster than `Xdebug`.
 `PCOV` needs `PHP >= 7.1`.  
 If your source code directory is other than `src`, `lib` or, `app`, specify `pcov.directory` using the `ini-values` input.  
 
+
 ```yaml
-uses: shivammathur/setup-php@v2
+uses: shivammathur/setup-php@v1
 with:
   php-version: '7.4'
   ini-values: pcov.directory=api #optional, see above for usage.
   coverage: pcov
 ```
 
-### Disable Coverage
+### Disable coverage
 
-Specify `coverage: none` to remove both `Xdebug` and `PCOV`.  
+Specify `coverage: none` to disable both `Xdebug` and `PCOV`.  
 Consider disabling the coverage using this PHP action for these reasons.
 
 - You are not generating coverage reports while testing.
 - It will remove `Xdebug`, which will have a positive impact on PHP performance.
 - You are using `phpdbg` for running your tests.
-- You are profiling your code using `blackfire`.
 
 ```yaml
-uses: shivammathur/setup-php@v2
+uses: shivammathur/setup-php@v1
 with:
   php-version: '7.4'
   coverage: none
@@ -205,39 +147,15 @@ with:
 
 ## :memo: Usage
 
-### Inputs
+Inputs supported by this GitHub Action.
 
-#### `php-version` (required)
+- php-version `required`
+- extensions `optional`
+- ini-values `optional`
+- coverage `optional`
+- tools `optional`
 
-- Specify the PHP version you want to setup.
+See [action.yml](action.yml "Metadata for this GitHub Action") and usage below for more info.
-- Accepts a `string`. For example `'7.4'`.
-- See [PHP support](#tada-php-support) for supported PHP versions.
-
-#### `extensions` (optional)
-
-- Specify the extensions you want to add or remove.
-- Accepts a `string` in csv-format. For example `mbstring, :opcache`.
-- Non-default extensions prefixed with `:` are removed.
-- See [PHP extension support](#heavy_plus_sign-php-extension-support) for more info.
-
-#### `ini-values` (optional)
-
-- Specify the values you want to add to `php.ini`.
-- Accepts a `string` in csv-format. For example `post_max_size=256M, short_open_tag=On`.
-
-#### `coverage` (optional)
-
-- Specify the code coverage driver you want to setup.
-- Accepts `xdebug`, `pcov` or `none`.
-- See [coverage support](#signal_strength-coverage-support) for more info.
-
-#### `tools` (optional)
-
-- Specify the tools you want to setup.
-- Accepts a `string` in csv-format. For example `phpunit, phpcs`
-- See [tools Support](#wrench-tools-support) for tools supported.
-
-See below for more info.
 
 ### Basic Setup
 
@@ -249,13 +167,13 @@ steps:
   uses: actions/checkout@v2
 
 - name: Setup PHP
-  uses: shivammathur/setup-php@v2
+  uses: shivammathur/setup-php@v1
   with:
     php-version: '7.4'
-    extensions: mbstring, intl
+    extensions: mbstring, intl #optional, setup extensions
-    ini-values: post_max_size=256M, short_open_tag=On
+    ini-values: post_max_size=256M, short_open_tag=On #optional, setup php.ini configuration
-    coverage: xdebug    
+    coverage: xdebug #optional, setup coverage driver
-    tools: php-cs-fixer, phpunit
+    tools: php-cs-fixer, phpunit #optional, setup tools globally
 ```
 
 ### Matrix Setup
@@ -276,13 +194,13 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Setup PHP
-      uses: shivammathur/setup-php@v2
+      uses: shivammathur/setup-php@v1
       with:
         php-version: ${{ matrix.php-versions }}
-        extensions: mbstring, intl
+        extensions: mbstring, intl #optional, setup extensions
-        ini-values: post_max_size=256M, short_open_tag=On
+        ini-values: post_max_size=256M, short_open_tag=On #optional, setup php.ini configuration
-        coverage: xdebug        
+        coverage: xdebug #optional, setup coverage driver
-        tools: php-cs-fixer, phpunit
+        tools: php-cs-fixer, phpunit #optional, setup tools globally
 ```
 
 ### Experimental Setup
@@ -301,85 +219,20 @@ steps:
   uses: actions/checkout@v2
 
 - name: Setup PHP
-  uses: shivammathur/setup-php@v2
+  uses: shivammathur/setup-php@v1
   with:
     php-version: '8.0'
-    extensions: mbstring
+    extensions: mbstring #optional, setup extensions
-    ini-values: opcache.jit_buffer_size=256M, opcache.jit=1235, pcre.jit=1
+    ini-values: opcache.jit_buffer_size=256M, opcache.jit=1235, pcre.jit=1 #optional, setup php.ini configuration
-    coverage: pcov
+    coverage: pcov #optional, setup PCOV, Xdebug does not support this version yet.
-    tools: php-cs-fixer, phpunit
+    tools: php-cs-fixer, phpunit #optional, setup tools globally    
-```
-
-### Self Hosted Setup
-
-> Setup PHP on a self-hosted runner.
-
-- `PHP 5.6` and newer versions are supported on self-hosted runners.
-- `Windows 7` and newer, `Windows Server 2012 R2` and newer, `Ubuntu 18.04`, `Ubuntu 16.04` and `MacOS X Catalina 10.15` are supported.
-- 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 setup the runner directly on the host OS or in a VM, 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.
-
-Specify the environment variable `runner` with the value `self-hosted`. Without this your workflow will fail.
-
-```yaml
-jobs:
-  run:
-    runs-on: self-hosted
-    strategy:
-      matrix:        
-        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
-    name: PHP ${{ matrix.php-versions }}
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php-versions }}
-      env:
-        runner: self-hosted # Specify the runner.
-```
-
-### Local Testing Setup
-
-> Test your `Ubuntu` workflow locally using [`nektos/act`](https://github.com/nektos/act "Project to test GitHub Actions locally").
-
-```yaml
-jobs:
-  run:
-    runs-on: ubuntu-latest
-    name: PHP 7.4 Test
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: 7.4
-```
-
-Run the workflow locally with `act` using [`shivammathur/node`](https://github.com/shivammathur/node-docker "Docker image to run setup-php") docker image.
-
-```bash
-# For runs-on: ubuntu-latest
-act -P ubuntu-latest=shivammathur/node:latest
-
-# For runs-on: ubuntu-18.04
-act -P ubuntu-18.04=shivammathur/node:latest
-
-# For runs-on: ubuntu-16.04
-act -P ubuntu-16.04=shivammathur/node:xenial
 ```
 
 ### Thread Safe Setup
 
-> Setup both `TS` and `NTS` PHP on `Windows`.
-
 - `NTS` versions are setup by default.
-- On `Ubuntu` and `macOS` only `NTS` versions are supported.
+- On `ubuntu` and `macOS` only NTS versions are supported.
-- On `Windows` both `TS` and `NTS` versions are supported.
+- On `windows` both `TS` and `NTS` versions are supported.
 
 ```yaml
 jobs:
@@ -391,90 +244,21 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Setup PHP
-      uses: shivammathur/setup-php@v2
+      uses: shivammathur/setup-php@v1
       with:
         php-version: '7.4'
       env:
-        phpts: ts # specify ts or nts
+        PHPTS: ts # specify ts or nts
 ```
 
-### Force Update
+### Cache dependencies
 
-> Update to latest patch of PHP versions.
+You can persist composer's internal cache directory using the [`action/cache`](https://github.com/actions/cache "GitHub Action to cache files") GitHub Action. Dependencies cached are loaded directly instead of downloading them while installation. The files cached are available across check-runs and will reduce the workflow execution time.
 
-- Pre-installed PHP versions on the GitHub Actions runner are not updated to their latest patch release by default.
+**Note:** Please do not cache `vendor` directory using `action/cache` as that will have side-effects.
-- You can specify the `update` environment variable to `true` to force update to the latest release.
 
 ```yaml
-- name: Setup PHP
+- name: Get Composer Cache Directory
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: '7.4'
-  env:
-    update: true # specify true or false
-```
-
-### Verbose Setup
-
-> 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`](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.
-
-```yaml
-runs-on: ${{ matrix.operating-system }}
-strategy:
-  matrix:
-    operating-system: [ubuntu-latest, windows-latest, macos-latest]
-    php-versions: ['7.2', '7.3', '7.4']
-name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
-env:
-  extensions: intl, pcov
-  key: cache-v1 # can be any string, change to clear the extension cache.
-steps:
-- name: Checkout
-  uses: actions/checkout@v2
-
-- name: Setup cache environment
-  id: cache-env
-  uses: shivammathur/cache-extensions@v1
-  with:
-    php-version: ${{ matrix.php-versions }}
-    extensions: ${{ env.extensions }}
-    key: ${{ env.key }}
-
-- name: Cache extensions
-  uses: actions/cache@v1
-  with:
-    path: ${{ steps.cache-env.outputs.dir }}
-    key: ${{ steps.cache-env.outputs.key }}
-    restore-keys: ${{ steps.cache-env.outputs.key }}
-
-- name: Setup PHP
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: ${{ matrix.php-versions }}
-    extensions: ${{ env.extensions }}
-```
-
-**Note:** If you setup both `TS` and `NTS` PHP versions on `windows`, add `${{ env.phpts }}` to `key` and `restore-keys` inputs in `actions/cache` step.
-
-### Cache Composer Dependencies
-
-If your project uses composer, you can persist composer's internal cache directory. Dependencies cached are loaded directly instead of downloading them while installation. The files cached are available across check-runs and will reduce the workflow execution time.
-
-```yaml
-- name: Get composer cache directory
   id: composer-cache
   run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
@@ -485,71 +269,28 @@ If your project uses composer, you can persist composer's internal cache directo
     key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
     restore-keys: ${{ runner.os }}-composer-
 
-- name: Install dependencies
+- name: Install Dependencies
   run: composer install --prefer-dist
 ```
 
-**Notes**
+In the above example, if you support a range of `composer` dependencies and do not commit `composer.lock`, you can use the hash of `composer.json` as the key for your cache.
-- Please do not cache `vendor` directory using `action/cache` as that will have side-effects.
-- In the above example, if you support a range of `composer` dependencies and do not commit `composer.lock`, you can use the hash of `composer.json` as the key for your cache.
 
 ```yaml
 key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} 
 ``` 
 
-### Cache Node.js Dependencies
-
-If your project has node.js dependencies, you can persist npm's or yarn's cache directory. The cached files are available across check-runs and will reduce the workflow execution time.
-
-```yaml
-- name: Get node.js cache directory
-  id: node-cache-dir
-  run: echo "::set-output name=dir::$(npm config get cache)" # Use $(yarn cache dir) for yarn
-
-- name: Cache dependencies
-  uses: actions/cache@v1
-  with:
-    path: ${{ steps.node-cache-dir.outputs.dir }}
-    key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} # Use '**/yarn.lock' for yarn
-    restore-keys: ${{ runner.os }}-node-
-```
-
-**Note:** Please do not cache `node_modules` directory as that will have side-effects.
-
-### Composer GitHub OAuth
-
-If you have a number of workflows which setup multiple tools or have many composer dependencies, you might hit the GitHub's rate limit for composer. To avoid that you can add a `OAuth` token to the composer's config by setting `COMPOSER_TOKEN` environment variable. You can use [`GITHUB_TOKEN`](https://help.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token "GITHUB_TOKEN documentation") secret for this purpose.
-
-```yaml
-- name: Setup PHP
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: '7.4'
-  env:
-    COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-```
-
 ### Problem Matchers
 
-#### PHP
-
-Setup problem matchers for your `PHP` output by adding this step after the `setup-php` step. This will scan the logs for PHP errors and warnings, and surface them prominently in the GitHub Actions UI by creating annotations and log file decorations.
-
-```yaml
-- name: Setup problem matchers for PHP
-  run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
-```
-
 #### PHPUnit
 
-Setup problem matchers for your `PHPUnit` output by adding this step after the `setup-php` step. This will scan the logs for failing tests and surface that information prominently in the GitHub Actions UI by creating annotations and log file decorations.
+You can setup problem matchers for your `PHPUnit` output by adding this step after the `setup-php` step. This will scan the logs for failing tests and surface that information prominently in the GitHub Actions UI by creating annotations and log file decorations.
 
 ```yaml
-- name: Setup problem matchers for PHPUnit
+- name: Setup Problem Matchers for PHPUnit
   run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 ```
 
-#### Other Tools
+#### Other tools
 
 For tools that support `checkstyle` reporting like `phpstan`, `psalm`, `php-cs-fixer` and `phpcs` you can use `cs2pr` to annotate your code.  
 For examples refer to [cs2pr documentation](https://github.com/staabm/annotate-pull-request-from-checkstyle).  
@@ -558,7 +299,7 @@ For examples refer to [cs2pr documentation](https://github.com/staabm/annotate-p
 
 ```yaml
 - name: Setup PHP
-  uses: shivammathur/setup-php@v2
+  uses: shivammathur/setup-php@v1
   with:
     php-version: '7.4'
     tools: cs2pr, phpstan
@@ -573,8 +314,6 @@ Examples for setting up this GitHub Action with different PHP Frameworks/Package
 
 |Framework/Package|Runs on|Workflow|
 |--- |--- |--- |
-|Blackfire|`macOS`, `ubuntu` and `windows`|[blackfire.yml](./examples/blackfire.yml "GitHub Action using Blackfire")|
-|Blackfire Player|`macOS`, `ubuntu` and `windows`|[blackfire-player.yml](./examples/blackfire-player.yml "GitHub Action using Blackfire Player")|
 |CakePHP with `MySQL` and `Redis`|`ubuntu`|[cakephp-mysql.yml](./examples/cakephp-mysql.yml "GitHub Action for CakePHP with MySQL and Redis")|
 |CakePHP with `PostgreSQL` and `Redis`|`ubuntu`|[cakephp-postgres.yml](./examples/cakephp-postgres.yml "GitHub Action for CakePHP with Postgres and Redis")|
 |CakePHP without services|`macOS`, `ubuntu` and `windows`|[cakephp.yml](./examples/cakephp.yml "GitHub Action for CakePHP without services")|
@@ -599,32 +338,27 @@ Examples for setting up this GitHub Action with different PHP Frameworks/Package
 
 ## :scroll: License
 
-The scripts and documentation in this project are released under the [MIT License](LICENSE "License for shivammathur/setup-php"). This project has multiple [dependencies](#bookmark-dependencies "Dependencies for this PHP Action"). Their licenses can be found in their respective repositories.
+The scripts and documentation in this project are released under the [MIT License](LICENSE "License for shivammathur/setup-php"). This project has multiple [dependencies](https://github.com/shivammathur/setup-php/network/dependencies "Dependencies for this PHP Action") and uses [various works](#bookmark-this-action-uses-the-following-works "Tools used by this action"). Their licenses can be found in their respective repositories.
 
 ## :+1: Contributions
 
 Contributions are welcome! See [Contributor's Guide](.github/CONTRIBUTING.md "shivammathur/setup-php contribution guide"). If you face any issues while using this or want to suggest a feature/improvement, create an issue [here](https://github.com/shivammathur/setup-php/issues "Issues reported").
 
-## :sparkling_heart: Support This Project
+## :sparkling_heart: Support this project
 
 If this action helped you.
 
-- To support this project subscribe on [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon") or sponsor using [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal").
 - Please star the project and share it with the community.
-- If you blog, write about your experience of using this action.
+- If you blog, write about your experience while using this action.
+- I maintain this in my free time, please support me with a [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon") subscription or a one time contribution using [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal").
 - If you need any help using this, please contact me using [Codementor](https://www.codementor.io/shivammathur "Shivam Mathur Codementor")
 
-## :bookmark: Dependencies
+## :bookmark: This action uses the following works
 
-- [Node.js dependencies](https://github.com/shivammathur/setup-php/network/dependencies "Node.js dependencies")
+- [ppa:ondrej/php](https://launchpad.net/~ondrej/+archive/ubuntu/php "Pre-compiled ubuntu packages")
-- [gplessis/dotdeb-php](https://github.com/gplessis/dotdeb-php "Packaging for end of life PHP versions")
+- [shivammathur/php-builder](https://github.com/shivammathur/php-builder "Pre-compiled nightly PHP builds")
 - [mlocati/powershell-phpmanager](https://github.com/mlocati/powershell-phpmanager "Package to handle PHP on windows")
-- [ppa:ondrej/php](https://launchpad.net/~ondrej/+archive/ubuntu/php "Packaging active PHP packages")
-- [shivammathur/cache-extensions](https://github.com/shivammathur/cache-extensions "GitHub action to help with caching PHP extensions")
 - [shivammathur/homebrew-php](https://github.com/shivammathur/homebrew-php "Tap for PHP builds for MacOS")
-- [shivammathur/php-builder](https://github.com/shivammathur/php-builder "Nightly PHP package")
-- [shivammathur/php5-darwin](https://github.com/shivammathur/php5-darwin "Scripts to setup PHP5 versions on darwin")
-- [shivammathur/php5-ubuntu](https://github.com/shivammathur/php5-ubuntu "Scripts to setup PHP5 versions on ubuntu")
 
 ## :bookmark_tabs: Further Reading
 

__tests__/config.test.ts

@@ -7,7 +7,7 @@ describe('Config tests', () => {
       'win32'
     );
     expect(win32).toContain(
-      'Add-Content "$php_dir\\php.ini" "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata"'
+      'Add-Content C:\\tools\\php\\php.ini "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata"'
     );
 
     win32 = await config.addINIValues(

__tests__/extensions.test.ts

@@ -3,31 +3,14 @@ import * as extensions from '../src/extensions';
 describe('Extension tests', () => {
   it('checking addExtensionOnWindows', async () => {
     let win32: string = await extensions.addExtension(
-      'Xdebug, pcov, sqlite, :intl, phalcon4, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2',
+      'xdebug, pcov, phalcon4, ast-beta',
       '7.4',
       'win32'
     );
     expect(win32).toContain('Add-Extension xdebug');
     expect(win32).toContain('Add-Extension pcov');
-    expect(win32).toContain('Add-Extension sqlite3');
-    expect(win32).toContain('Remove-Extension intl');
     expect(win32).toContain('phalcon.ps1 phalcon4');
     expect(win32).toContain('Add-Extension ast beta');
-    expect(win32).toContain('Add-Extension grpc stable 1.2.3');
-    expect(win32).toContain('Add-Extension inotify alpha 1.2.3');
-
-    win32 = await extensions.addExtension('mysql', '7.4', 'win32');
-    expect(win32).toContain('Add-Extension mysqli');
-    expect(win32).toContain('Add-Extension mysqlnd');
-
-    win32 = await extensions.addExtension('mysql', '8.0', 'win32');
-    expect(win32).toContain('Add-Extension mysqli');
-    expect(win32).toContain('Add-Extension mysqlnd');
-
-    win32 = await extensions.addExtension('mysql', '5.5', 'win32');
-    expect(win32).toContain('Add-Extension mysql');
-    expect(win32).toContain('Add-Extension mysqli');
-    expect(win32).toContain('Add-Extension mysqlnd');
 
     win32 = await extensions.addExtension(
       'phalcon3, does_not_exist',
@@ -40,32 +23,19 @@ describe('Extension tests', () => {
 
     win32 = await extensions.addExtension('xdebug', '7.2', 'fedora');
     expect(win32).toContain('Platform fedora is not supported');
-
-    win32 = await extensions.addExtension('blackfire', '7.3', 'win32');
-    expect(win32).toContain('blackfire.ps1 7.3 blackfire');
-
-    win32 = await extensions.addExtension('blackfire-1.31.0', '7.3', 'win32');
-    expect(win32).toContain('blackfire.ps1 7.3 blackfire-1.31.0');
   });
 
   it('checking addExtensionOnLinux', async () => {
     let linux: string = await extensions.addExtension(
-      'Xdebug, pcov, sqlite, :intl, ast, uopz, ast-beta, pdo_mysql, pdo-odbc, xdebug-alpha, grpc-1.2.3',
+      'xdebug, pcov, ast-beta, xdebug-alpha',
       '7.4',
       'linux'
     );
-    expect(linux).toContain('update_extension xdebug 2.9.3');
+    expect(linux).toContain('update_extension xdebug 2.9.0');
-    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'
+      'sudo DEBIAN_FRONTEND=noninteractive apt-get install -y php7.4-pcov'
     );
-    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');
-    expect(linux).toContain('add_pecl_extension grpc 1.2.3 extension');
     expect(linux).toContain(
       'add_unstable_extension xdebug alpha zend_extension'
     );
@@ -90,26 +60,17 @@ describe('Extension tests', () => {
     linux = await extensions.addExtension('phalcon3, phalcon4', '7.3', 'linux');
     expect(linux).toContain('phalcon.sh phalcon3 7.3');
     expect(linux).toContain('phalcon.sh phalcon4 7.3');
-
-    linux = await extensions.addExtension('blackfire', '7.3', 'linux');
-    expect(linux).toContain('blackfire.sh 7.3 blackfire');
-
-    linux = await extensions.addExtension('blackfire-1.31.0', '7.3', 'linux');
-    expect(linux).toContain('blackfire.sh 7.3 blackfire-1.31.0');
   });
 
   it('checking addExtensionOnDarwin', async () => {
     let darwin: string = await extensions.addExtension(
-      'Xdebug, pcov, sqlite, :intl, ast-beta, grpc-1.2.3',
+      'xdebug, pcov, ast-beta',
       '7.2',
       'darwin'
     );
     expect(darwin).toContain('sudo pecl install -f xdebug');
     expect(darwin).toContain('sudo pecl install -f pcov');
-    expect(darwin).toContain('sudo pecl install -f sqlite3');
-    expect(darwin).toContain('remove_extension intl');
     expect(darwin).toContain('add_unstable_extension ast beta extension');
-    expect(darwin).toContain('add_pecl_extension grpc 1.2.3 extension');
 
     darwin = await extensions.addExtension('phalcon3', '7.0', 'darwin');
     expect(darwin).toContain('phalcon_darwin.sh phalcon3 7.0');
@@ -123,15 +84,6 @@ describe('Extension tests', () => {
     darwin = await extensions.addExtension('pcov', '7.2', 'darwin');
     expect(darwin).toContain('sudo pecl install -f pcov');
 
-    darwin = await extensions.addExtension('xdebug', '5.3', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug-2.2.7');
-
-    darwin = await extensions.addExtension('xdebug', '5.4', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug-2.4.1');
-
-    darwin = await extensions.addExtension('xdebug', '5.5', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug-2.5.5');
-
     darwin = await extensions.addExtension('xdebug', '5.6', 'darwin');
     expect(darwin).toContain('sudo pecl install -f xdebug-2.5.5');
 
@@ -155,12 +107,6 @@ describe('Extension tests', () => {
     expect(darwin).toContain('brew install pkg-config imagemagick');
     expect(darwin).toContain('sudo pecl install -f imagick');
 
-    darwin = await extensions.addExtension('blackfire', '7.3', 'darwin');
-    expect(darwin).toContain('blackfire_darwin.sh 7.3 blackfire');
-
-    darwin = await extensions.addExtension('blackfire-1.31.0', '7.3', 'darwin');
-    expect(darwin).toContain('blackfire_darwin.sh 7.3 blackfire-1.31.0');
-
     darwin = await extensions.addExtension(
       'does_not_exist',
       '7.2',

__tests__/install.test.ts

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

__tests__/matchers.test.ts

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

__tests__/tools.test.ts

@@ -10,6 +10,30 @@ describe('Tools tests', () => {
     );
   });
 
+  it('checking getCommand', async () => {
+    expect(await tools.getCommand('linux', 'composertool')).toBe(
+      'add_composertool '
+    );
+    expect(await tools.getCommand('darwin', 'composertool')).toBe(
+      'add_composertool '
+    );
+    expect(await tools.getCommand('win32', 'composertool')).toBe(
+      'Add-Composertool '
+    );
+    expect(await tools.getCommand('fedora', 'composertool')).toContain(
+      'Platform fedora is not supported'
+    );
+  });
+
+  it('checking getCommand', async () => {
+    expect(await tools.getCommand('linux', 'pecl')).toBe('add_pecl ');
+    expect(await tools.getCommand('darwin', 'pecl')).toBe('add_pecl ');
+    expect(await tools.getCommand('win32', 'pecl')).toBe('Add-Pecl ');
+    expect(await tools.getCommand('fedora', 'pecl')).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');
@@ -187,7 +211,7 @@ describe('Tools tests', () => {
     );
   });
 
-  it('checking getPharUri', async () => {
+  it('checking getPhpunitUri', async () => {
     expect(await tools.getPharUrl('domain', 'tool', '', 'latest')).toBe(
       'domain/tool.phar'
     );
@@ -258,15 +282,6 @@ describe('Tools tests', () => {
     ]);
   });
 
-  it('checking getWpCliUri', async () => {
-    expect(await tools.getWpCliUrl('latest')).toBe(
-      'wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true'
-    );
-    expect(await tools.getWpCliUrl('2.4.0')).toBe(
-      'wp-cli/wp-cli/releases/download/v2.4.0/wp-cli-2.4.0.phar'
-    );
-  });
-
   it('checking addArchive', async () => {
     let script: string = await tools.addArchive(
       'tool',
@@ -349,14 +364,10 @@ describe('Tools tests', () => {
 
   it('checking addTools on linux', async () => {
     const script: string = await tools.addTools(
-      'blackfire, blackfire-player, cs2pr, flex, php-cs-fixer, phpstan, phpunit, pecl, phinx, phinx:1.2.3, phive, php-config, phpize, symfony, wp-cli',
+      'cs2pr, php-cs-fixer, phpstan, phpunit, pecl, phinx, phinx:1.2.3, phive, php-config, phpize, symfony',
       '7.4',
       'linux'
     );
-    expect(script).toContain('add_blackfire');
-    expect(script).toContain(
-      'add_tool https://get.blackfire.io/blackfire-player.phar blackfire-player'
-    );
     expect(script).toContain(
       'add_tool https://getcomposer.org/composer-stable.phar composer'
     );
@@ -378,11 +389,7 @@ describe('Tools tests', () => {
     expect(script).toContain(
       'add_tool https://github.com/symfony/cli/releases/latest/download/symfony_linux_amd64 symfony'
     );
-    expect(script).toContain(
-      'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli'
-    );
     expect(script).toContain('add_pecl');
-    expect(script).toContain('add_composertool flex flex symfony/');
     expect(script).toContain('add_composertool phinx phinx robmorgan/');
     expect(script).toContain('add_composertool phinx phinx:1.2.3 robmorgan/');
     expect(script).toContain('add_devtools');
@@ -391,23 +398,16 @@ describe('Tools tests', () => {
   });
   it('checking addTools on darwin', async () => {
     const script: string = await tools.addTools(
-      'blackfire, blackfire-player, flex, infection, phpcs, phpcbf, phpcpd, phpmd, psalm, phinx, vapor-cli, phive:1.2.3, cs2pr:1.2.3, composer-prefetcher:1.2.3, phpize, php-config, symfony, symfony:1.2.3, wp-cli',
+      'phpcs, phpcbf, phpcpd, phpmd, psalm, phinx, phive:1.2.3, cs2pr:1.2.3, composer-prefetcher:1.2.3, phpize, php-config, symfony, symfony:1.2.3',
       '7.4',
       'darwin'
     );
-    expect(script).toContain('add_blackfire');
-    expect(script).toContain(
-      'add_tool https://get.blackfire.io/blackfire-player.phar blackfire-player'
-    );
     expect(script).toContain(
       'add_tool https://getcomposer.org/composer-stable.phar composer'
     );
     expect(script).toContain(
       'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/download/1.2.3/cs2pr cs2pr'
     );
-    expect(script).toContain(
-      'add_tool https://github.com/infection/infection/releases/latest/download/infection.phar infection'
-    );
     expect(script).toContain(
       'add_tool https://github.com/squizlabs/PHP_CodeSniffer/releases/latest/download/phpcs.phar phpcs'
     );
@@ -423,8 +423,6 @@ describe('Tools tests', () => {
     expect(script).toContain(
       'https://github.com/vimeo/psalm/releases/latest/download/psalm.phar psalm'
     );
-    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/phar-io/phive/releases/download/1.2.3/phive-1.2.3.phar phive'
@@ -438,29 +436,21 @@ describe('Tools tests', () => {
     expect(script).toContain(
       'add_tool https://github.com/symfony/cli/releases/download/v1.2.3/symfony_darwin_amd64 symfony'
     );
-    expect(script).toContain(
-      'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli'
-    );
     expect(script).toContain('add_log "$tick" "phpize" "Added"');
     expect(script).toContain('add_log "$tick" "php-config" "Added"');
   });
   it('checking addTools on windows', async () => {
     const script: string = await tools.addTools(
-      'blackfire, blackfire-player:1.8.1, codeception, cs2pr, deployer, flex, prestissimo, phpmd, phinx, phive:0.13.2, php-config, phpize, symfony, wp-cli, does_not_exit',
+      'codeception, cs2pr, deployer, prestissimo, phpmd, phinx, phive:0.13.2, php-config, phpize, symfony, does_not_exit',
       '7.4',
       'win32'
     );
-    expect(script).toContain('Add-Blackfire');
-    expect(script).toContain(
-      'Add-Tool https://get.blackfire.io/blackfire-player-v1.8.1.phar blackfire-player'
-    );
     expect(script).toContain(
       'Add-Tool https://getcomposer.org/composer-stable.phar composer'
     );
     expect(script).toContain(
       'Add-Tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr'
     );
-    expect(script).toContain('Add-Composertool flex flex symfony/');
     expect(script).toContain(
       'Add-Tool https://deployer.org/deployer.phar deployer'
     );
@@ -475,9 +465,6 @@ describe('Tools tests', () => {
     expect(script).toContain(
       'Add-Tool https://github.com/symfony/cli/releases/latest/download/symfony_windows_amd64.exe symfony'
     );
-    expect(script).toContain(
-      'Add-Tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli'
-    );
     expect(script).toContain('phpize is not a windows tool');
     expect(script).toContain('php-config is not a windows tool');
     expect(script).toContain('Tool does_not_exit is not supported');

__tests__/utils.test.ts

@@ -29,9 +29,7 @@ describe('Utils tests', () => {
   it('checking asyncForEach', async () => {
     const array: Array<string> = ['a', 'b', 'c'];
     let concat = '';
-    await utils.asyncForEach(array, async function (
+    await utils.asyncForEach(array, async function(str: string): Promise<void> {
-      str: string
-    ): Promise<void> {
       concat += str;
     });
     expect(concat).toBe('abc');
@@ -57,12 +55,12 @@ describe('Utils tests', () => {
       path.join(__dirname, '../src/scripts/win32.ps1'),
       'utf8'
     );
-    expect(await utils.readScript('darwin.sh')).toBe(darwin);
+    expect(await utils.readScript('darwin.sh', '7.4', 'darwin')).toBe(darwin);
-    expect(await utils.readScript('darwin.sh')).toBe(darwin);
+    expect(await utils.readScript('darwin.sh', '7.3', 'darwin')).toBe(darwin);
-    expect(await utils.readScript('linux.sh')).toBe(linux);
+    expect(await utils.readScript('linux.sh', '7.4', 'linux')).toBe(linux);
-    expect(await utils.readScript('linux.sh')).toBe(linux);
+    expect(await utils.readScript('linux.sh', '7.3', 'linux')).toBe(linux);
-    expect(await utils.readScript('win32.ps1')).toBe(win32);
+    expect(await utils.readScript('win32.ps1', '7.4', 'win32')).toBe(win32);
-    expect(await utils.readScript('win32.ps1')).toBe(win32);
+    expect(await utils.readScript('win32.ps1', '7.3', 'win32')).toBe(win32);
   });
 
   it('checking writeScripts', async () => {
@@ -70,10 +68,7 @@ describe('Utils tests', () => {
     const runner_dir: string = process.env['RUNNER_TOOL_CACHE'] || '';
     const script_path: string = path.join(runner_dir, 'test.sh');
     await utils.writeScript('test.sh', testString);
-    await fs.readFile(script_path, function (
+    await fs.readFile(script_path, function(error: Error | null, data: Buffer) {
-      error: Error | null,
-      data: Buffer
-    ) {
       expect(testString).toBe(data.toString());
     });
     await cleanup(script_path);

action.yml

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

examples/bedrock.yml

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

examples/blackfire-player.yml

@@ -1,31 +0,0 @@
-# GitHub Action for Blackfire Player
-name: Play a Blackfire Scenario
-on: [push, pull_request]
-jobs:
-  blackfire-player:
-    name: Blackfire (PHP ${{ matrix.php-versions }})
-    # Add your Blackfire credentials securely using GitHub Secrets
-    env:
-      BLACKFIRE_SERVER_ID: ${{ secrets.BLACKFIRE_SERVER_ID }}
-      BLACKFIRE_SERVER_TOKEN: ${{ secrets.BLACKFIRE_SERVER_TOKEN }}
-      BLACKFIRE_CLIENT_ID: ${{ secrets.BLACKFIRE_CLIENT_ID }}
-      BLACKFIRE_CLIENT_TOKEN: ${{ secrets.BLACKFIRE_CLIENT_TOKEN }}
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      fail-fast: false
-      matrix:
-        operating-system: [ubuntu-latest, windows-latest, macos-latest]
-        php-versions: ['7.2', '7.3', '7.4']
-        # blackfire-player supports PHP >= 5.5
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: blackfire
-          tools: blackfire, blackfire-player #Setup Blackfire client, agent and player
-          coverage: none
-      - name: Play the scenario
-        run: blackfire-player run scenario.bkf # Refer to https://blackfire.io/docs/player/index#usage

examples/blackfire.yml

@@ -1,31 +0,0 @@
-# GitHub Action for Blackfire
-name: Profiling with blackfire
-on: [push, pull_request]
-jobs:
-  blackfire:
-    name: Blackfire (PHP ${{ matrix.php-versions }})
-    # Add your Blackfire credentials securely using GitHub Secrets
-    env:
-      BLACKFIRE_SERVER_ID: ${{ secrets.BLACKFIRE_SERVER_ID }}
-      BLACKFIRE_SERVER_TOKEN: ${{ secrets.BLACKFIRE_SERVER_TOKEN }}
-      BLACKFIRE_CLIENT_ID: ${{ secrets.BLACKFIRE_CLIENT_ID }}
-      BLACKFIRE_CLIENT_TOKEN: ${{ secrets.BLACKFIRE_CLIENT_TOKEN }}
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      fail-fast: false
-      matrix:
-        operating-system: [ubuntu-latest, windows-latest, macos-latest]
-        php-versions: ['7.2', '7.3', '7.4']
-        # Blackfire supports PHP >= 5.3 on ubuntu and macos and PHP >= 5.4 on windows
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: blackfire
-          tools: blackfire #Setup Blackfire client and agent
-          coverage: none
-      - name: Profile
-        run: blackfire run php my-script.php # Refer to https://blackfire.io/docs/cookbooks/profiling-cli

examples/cakephp-mysql.yml

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

examples/cakephp-postgres.yml

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

examples/cakephp.yml

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

examples/codeigniter.yml

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

examples/laravel-mysql.yml

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

examples/laravel-postgres.yml

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

examples/laravel.yml

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

examples/lumen-mysql.yml

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

examples/lumen-postgres.yml

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

examples/lumen.yml

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

examples/phalcon-mysql.yml

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

examples/phalcon-postgres.yml

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

examples/sage.yml

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

examples/slim-framework.yml

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

examples/symfony-mysql.yml

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

examples/symfony-postgres.yml

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

examples/symfony.yml

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

examples/yii2-mysql.yml

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

examples/yii2-postgres.yml

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

examples/zend-framework.yml

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "2.2.1",
+  "version": "1.8.4",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "dist/index.js",
@@ -24,33 +24,33 @@
   "author": "shivammathur",
   "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.2.4",
+    "@actions/core": "^1.2.3",
-    "@actions/exec": "^1.0.4",
+    "@actions/exec": "^1.0.3",
     "@actions/io": "^1.0.2",
     "fs": "0.0.1-security"
   },
   "devDependencies": {
-    "@types/jest": "^25.2.2",
+    "@types/jest": "^25.1.3",
-    "@types/node": "^14.0.1",
+    "@types/node": "^13.7.7",
-    "@typescript-eslint/eslint-plugin": "^2.34.0",
+    "@typescript-eslint/eslint-plugin": "^2.21.0",
-    "@typescript-eslint/parser": "^2.34.0",
+    "@typescript-eslint/parser": "^2.21.0",
-    "@zeit/ncc": "^0.22.2",
+    "@zeit/ncc": "^0.21.1",
-    "eslint": "^7.0.0",
+    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.11.0",
+    "eslint-config-prettier": "^6.10.0",
-    "eslint-plugin-import": "^2.20.2",
+    "eslint-plugin-import": "^2.20.1",
-    "eslint-plugin-jest": "^23.13.1",
+    "eslint-plugin-jest": "^23.8.1",
-    "eslint-plugin-prettier": "^3.1.3",
+    "eslint-plugin-prettier": "^3.1.2",
-    "husky": "^4.2.5",
+    "husky": "^4.2.3",
-    "jest": "^26.0.1",
+    "jest": "^25.1.0",
-    "jest-circus": "^26.0.1",
+    "jest-circus": "^25.1.0",
-    "prettier": "^2.0.5",
+    "prettier": "^1.19.1",
-    "ts-jest": "^26.0.0",
+    "ts-jest": "^25.2.1",
-    "typescript": "^3.9.2"
+    "typescript": "^3.8.3"
   },
   "husky": {
     "skipCI": true,
     "hooks": {
-      "pre-commit": "npm run format && npm run lint && npm run test && npm run build && npm run release"
+      "pre-commit": "npm run format && npm run lint && npm run build && npm run release"
     }
   }
 }

src/config.ts

@@ -10,7 +10,7 @@ export async function addINIValuesUnix(
 ): Promise<string> {
   const ini_values: Array<string> = await utils.CSVArray(ini_values_csv);
   let script = '\n';
-  await utils.asyncForEach(ini_values, async function (line: string) {
+  await utils.asyncForEach(ini_values, async function(line: string) {
     script +=
       (await utils.addLog('$tick', line, 'Added to php.ini', 'linux')) + '\n';
   });
@@ -27,12 +27,15 @@ export async function addINIValuesWindows(
 ): Promise<string> {
   const ini_values: Array<string> = await utils.CSVArray(ini_values_csv);
   let script = '\n';
-  await utils.asyncForEach(ini_values, async function (line: string) {
+  await utils.asyncForEach(ini_values, async function(line: string) {
     script +=
       (await utils.addLog('$tick', line, 'Added to php.ini', 'win32')) + '\n';
   });
   return (
-    'Add-Content "$php_dir\\php.ini" "' + ini_values.join('\n') + '"' + script
+    'Add-Content C:\\tools\\php\\php.ini "' +
+    ini_values.join('\n') +
+    '"' +
+    script
   );
 }
 
@@ -41,7 +44,6 @@ export async function addINIValuesWindows(
  *
  * @param ini_values_csv
  * @param os_version
- * @param no_step
  */
 export async function addINIValues(
   ini_values_csv: string,

src/configs/php.json

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

src/coverage.ts

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

src/extensions.ts

@@ -14,91 +14,43 @@ export async function addExtensionDarwin(
   pipe: string
 ): Promise<string> {
   const extensions: Array<string> = await utils.extensionArray(extension_csv);
-  let add_script = '\n';
+  let script = '\n';
-  let remove_script = '\n';
+  await utils.asyncForEach(extensions, async function(extension: string) {
-  await utils.asyncForEach(extensions, async function (extension: string) {
+    extension = extension.toLowerCase();
     const version_extension: string = version + extension;
-    const [ext_name, ext_version]: string[] = extension.split('-');
+    const [extension_name, stability]: string[] = extension.split('-');
-    const ext_prefix = await utils.getExtensionPrefix(ext_name);
+    const prefix = await utils.getExtensionPrefix(extension_name);
-    const command_prefix = 'sudo pecl install -f ';
+    let install_command = '';
-    let command = '';
     switch (true) {
-      // match :extension
+      // match pre-release versions
-      case /^:/.test(ext_name):
-        remove_script += '\nremove_extension ' + ext_name.slice(1);
-        return;
-      // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-      // match 5.3blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
-      case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
-        version_extension
-      ):
-        command =
-          'bash ' +
-          path.join(__dirname, '../src/scripts/ext/blackfire_darwin.sh') +
-          ' ' +
-          version +
-          ' ' +
-          extension;
-        break;
-      // match pre-release versions. For example - xdebug-beta
       case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-        add_script +=
+        script +=
           '\nadd_unstable_extension ' +
-          ext_name +
+          extension_name +
           ' ' +
-          ext_version +
+          stability +
           ' ' +
-          ext_prefix;
+          prefix;
         return;
-      // match semver
+      case /5\.6xdebug/.test(version_extension):
-      case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
+        install_command = 'sudo pecl install -f xdebug-2.5.5' + pipe;
-        add_script +=
-          '\nadd_pecl_extension ' +
-          ext_name +
-          ' ' +
-          ext_version +
-          ' ' +
-          ext_prefix;
-        return;
-      // match 5.3xdebug
-      case /5\.3xdebug/.test(version_extension):
-        command = command_prefix + 'xdebug-2.2.7' + pipe;
         break;
-      // match 5.4xdebug
-      case /5\.4xdebug/.test(version_extension):
-        command = command_prefix + 'xdebug-2.4.1' + pipe;
-        break;
-      // match 5.5xdebug and 5.6xdebug
-      case /5\.[5-6]xdebug/.test(version_extension):
-        command = command_prefix + 'xdebug-2.5.5' + pipe;
-        break;
-      // match 7.0redis
       case /7\.0xdebug/.test(version_extension):
-        command = command_prefix + 'xdebug-2.9.0' + pipe;
+        install_command = 'sudo pecl install -f xdebug-2.9.0' + pipe;
         break;
-      // match 5.6redis
       case /5\.6redis/.test(version_extension):
-        command = command_prefix + 'redis-2.2.8' + pipe;
+        install_command = 'sudo pecl install -f redis-2.2.8' + pipe;
         break;
-      // match imagick
+      case /[5-9]\.\dimagick/.test(version_extension):
-      case /^imagick$/.test(extension):
+        install_command =
-        command =
           'brew install pkg-config imagemagick' +
           pipe +
-          ' && ' +
+          ' && sudo pecl install -f imagick' +
-          command_prefix +
-          'imagick' +
           pipe;
         break;
-      // match sqlite
-      case /^sqlite$/.test(extension):
-        extension = 'sqlite3';
-        command = command_prefix + extension + pipe;
-        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 +=
+        script +=
-          '\nbash ' +
+          'sh ' +
           path.join(__dirname, '../src/scripts/ext/phalcon_darwin.sh') +
           ' ' +
           extension +
@@ -106,13 +58,18 @@ export async function addExtensionDarwin(
           version;
         return;
       default:
-        command = command_prefix + extension + pipe;
+        install_command = 'sudo pecl install -f ' + extension + pipe;
         break;
     }
-    add_script +=
+    script +=
-      '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
+      '\nadd_extension ' +
+      extension +
+      ' "' +
+      install_command +
+      '" ' +
+      (await utils.getExtensionPrefix(extension));
   });
-  return add_script + remove_script;
+  return script;
 }
 
 /**
@@ -120,75 +77,27 @@ export async function addExtensionDarwin(
  *
  * @param extension_csv
  * @param version
+ * @param pipe
  */
 export async function addExtensionWindows(
   extension_csv: string,
-  version: string
+  version: string,
+  pipe: string
 ): Promise<string> {
   const extensions: Array<string> = await utils.extensionArray(extension_csv);
-  let add_script = '\n';
+  let script = '\n';
-  let remove_script = '\n';
+  await utils.asyncForEach(extensions, async function(extension: string) {
-  await utils.asyncForEach(extensions, async function (extension: string) {
+    extension = extension.toLowerCase();
-    const [ext_name, ext_version]: string[] = extension.split('-');
+    const [extension_name, stability]: string[] = extension.split('-');
     const version_extension: string = version + extension;
-    let matches: RegExpExecArray;
     switch (true) {
-      // Match :extension
+      // match pre-release versions
-      case /^:/.test(ext_name):
-        remove_script += '\nRemove-Extension ' + ext_name.slice(1);
-        return;
-      // match 5.4blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-      // match 5.4blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
-      case /^(5\.[4-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
-        version_extension
-      ):
-        add_script +=
-          '\n& ' +
-          path.join(__dirname, '../src/scripts/ext/blackfire.ps1') +
-          ' ' +
-          version +
-          ' ' +
-          extension;
-        return;
-      // match pre-release versions. For example - xdebug-beta
       case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-        add_script += '\nAdd-Extension ' + ext_name + ' ' + ext_version;
+        script += '\nAdd-Extension ' + extension_name + ' ' + stability;
-        break;
-      // match semver without state
-      case /.*-\d+\.\d+\.\d+$/.test(version_extension):
-        add_script += '\nAdd-Extension ' + ext_name + ' stable ' + ext_version;
-        return;
-      // match semver with state
-      case /.*-(\d+\.\d+\.\d)(beta|alpha|devel|snapshot)\d*/.test(
-        version_extension
-      ):
-        matches = /.*-(\d+\.\d+\.\d)(beta|alpha|devel|snapshot)\d*/.exec(
-          version_extension
-        ) as RegExpExecArray;
-        add_script +=
-          '\nAdd-Extension ' + ext_name + ' ' + matches[2] + ' ' + matches[1];
-        return;
-      // match 5.3mysql..5.6mysql
-      // match 5.3mysqli..5.6mysqli
-      // match 5.3mysqlnd..5.6mysqlnd
-      case /^5\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
-        add_script +=
-          '\nAdd-Extension mysql\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
-        break;
-      // match 7.0mysql..8.0mysql
-      // match 7.0mysqli..8.0mysqli
-      // match 7.0mysqlnd..8.0mysqlnd
-      case /[7-8]\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
-        add_script += '\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
-        break;
-      // match sqlite
-      case /^sqlite$/.test(extension):
-        extension = 'sqlite3';
-        add_script += '\nAdd-Extension ' + extension;
         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 +=
+        script +=
           '\n& ' +
           path.join(__dirname, '../src/scripts/ext/phalcon.ps1') +
           ' ' +
@@ -198,11 +107,11 @@ export async function addExtensionWindows(
           '\n';
         break;
       default:
-        add_script += '\nAdd-Extension ' + extension;
+        script += '\nAdd-Extension ' + extension;
         break;
     }
   });
-  return add_script + remove_script;
+  return script;
 }
 
 /**
@@ -218,56 +127,28 @@ export async function addExtensionLinux(
   pipe: string
 ): Promise<string> {
   const extensions: Array<string> = await utils.extensionArray(extension_csv);
-  let add_script = '\n';
+  let script = '\n';
-  let remove_script = '\n';
+  await utils.asyncForEach(extensions, async function(extension: string) {
-  await utils.asyncForEach(extensions, async function (extension: string) {
+    extension = extension.toLowerCase();
     const version_extension: string = version + extension;
-    const [ext_name, ext_version]: string[] = extension.split('-');
+    const [extension_name, stability]: string[] = extension.split('-');
-    const ext_prefix = await utils.getExtensionPrefix(ext_name);
+    const prefix = await utils.getExtensionPrefix(extension_name);
-    const command_prefix = 'sudo $debconf_fix apt-get install -y php';
+    let install_command = '';
-    let command = '';
     switch (true) {
-      // Match :extension
+      // match pre-release versions
-      case /^:/.test(ext_name):
-        remove_script += '\nremove_extension ' + ext_name.slice(1);
-        return;
-      // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-      // match 5.3blackfire-{semver}...5.6blackfire-{semver}, 7.0blackfire-{semver}...7.4blackfire-{semver}
-      case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
-        version_extension
-      ):
-        command =
-          'bash ' +
-          path.join(__dirname, '../src/scripts/ext/blackfire.sh') +
-          ' ' +
-          version +
-          ' ' +
-          extension;
-        break;
-      // match pre-release versions. For example - xdebug-beta
       case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-        add_script +=
+        script +=
           '\nadd_unstable_extension ' +
-          ext_name +
+          extension_name +
           ' ' +
-          ext_version +
+          stability +
           ' ' +
-          ext_prefix;
+          prefix;
-        return;
-      // match semver versions
-      case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-        add_script +=
-          '\nadd_pecl_extension ' +
-          ext_name +
-          ' ' +
-          ext_version +
-          ' ' +
-          ext_prefix;
         return;
       // match 5.6gearman..7.4gearman
       case /^((5\.6)|(7\.[0-4]))gearman$/.test(version_extension):
-        command =
+        install_command =
-          '\nbash ' +
+          'sh ' +
           path.join(__dirname, '../src/scripts/ext/gearman.sh') +
           ' ' +
           version +
@@ -275,47 +156,35 @@ export async function addExtensionLinux(
         break;
       // match 7.0phalcon3...7.3phalcon3 or 7.2phalcon4...7.4phalcon4
       case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-        add_script +=
+        script +=
-          '\nbash ' +
+          '\nsh ' +
           path.join(__dirname, '../src/scripts/ext/phalcon.sh') +
           ' ' +
           extension +
           ' ' +
           version;
         return;
-      // match 7.1xdebug..7.4xdebug
+      // match 7.0xdebug..7.4xdebug
-      case /^7\.[1-4]xdebug$/.test(version_extension):
+      case /^7\.[0-4]xdebug$/.test(version_extension):
-        add_script +=
+        script +=
-          '\nupdate_extension xdebug 2.9.3' +
+          '\nupdate_extension xdebug 2.9.0' +
           pipe +
           '\n' +
           (await utils.addLog('$tick', 'xdebug', 'Enabled', 'linux'));
         return;
-      // match pdo extensions
-      case /.*pdo[_-].*/.test(version_extension):
-        extension = extension
-          .replace('pdo_', '')
-          .replace('pdo-', '')
-          .replace('sqlite3', 'sqlite');
-        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;
+        install_command =
+          'sudo DEBIAN_FRONTEND=noninteractive apt-get install -y php' +
+          version +
+          '-' +
+          extension.replace('pdo_', '').replace('pdo-', '') +
+          pipe;
         break;
     }
-    add_script +=
+    script +=
-      '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
+      '\nadd_extension ' + extension + ' "' + install_command + '" ' + prefix;
   });
-  return add_script + remove_script;
+  return script;
 }
 
 /**
@@ -324,7 +193,7 @@ export async function addExtensionLinux(
  * @param extension_csv
  * @param version
  * @param os_version
- * @param no_step
+ * @param log_prefix
  */
 export async function addExtension(
   extension_csv: string,
@@ -346,7 +215,7 @@ export async function addExtension(
 
   switch (os_version) {
     case 'win32':
-      return script + (await addExtensionWindows(extension_csv, version));
+      return script + (await addExtensionWindows(extension_csv, version, pipe));
     case 'darwin':
       return script + (await addExtensionDarwin(extension_csv, version, pipe));
     case 'linux':

src/install.ts

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

src/matchers.ts

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

src/scripts/darwin.sh

@@ -19,25 +19,15 @@ add_log() {
 # Function to remove extensions
 remove_extension() {
   extension=$1
-  if check_extension "$extension"; then
+  sudo sed -i '' "/$extension/d" "$ini_file"
-    sudo sed -i '' "/$extension/d" "$ini_file"
+  sudo rm -rf "$scan_dir"/*"$extension"* >/dev/null 2>&1
-    sudo rm -rf "$scan_dir"/*"$extension"* >/dev/null 2>&1
+  sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1
-    sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1
-    (! check_extension "$extension" && add_log "$tick" ":$extension" "Removed") ||
-    add_log "$cross" ":$extension" "Could not remove $extension on PHP $semver"
-  else
-    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"
-    php -m | grep -i -q -w "$extension"
-  else
-    php -m | grep -i -q "$extension"
-  fi
 }
 
 # Fuction to get the PECL version
@@ -65,7 +55,7 @@ add_pecl_extension() {
   if [ "$ext_version" = "$pecl_version" ]; then
     add_log "$tick" "$extension" "Enabled"
   else
-    remove_extension "$extension" >/dev/null 2>&1
+    remove_extension "$extension"
     (
       sudo pecl install -f "$extension-$pecl_version" >/dev/null 2>&1 &&
       check_extension "$extension" &&
@@ -84,10 +74,11 @@ add_extension() {
   elif check_extension "$extension"; then
     add_log "$tick" "$extension" "Enabled"
   elif ! check_extension "$extension"; then
-    eval "$install_command" >/dev/null 2>&1 &&
+    (
-    if [[ "$version" =~ $old_versions ]]; then echo "$prefix=$ext_dir/$extension.so" >>"$ini_file"; fi
+      eval "$install_command" >/dev/null 2>&1 &&
-    (check_extension "$extension" && add_log "$tick" "$extension" "Installed and enabled") ||
+      check_extension "$extension" &&
-    add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
+      add_log "$tick" "$extension" "Installed and enabled"
+    ) || add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
   fi
 }
 
@@ -112,22 +103,14 @@ add_tool() {
   status_code=$(sudo curl -s -w "%{http_code}" -o "$tool_path" -L "$url")
   if [ "$status_code" = "200" ]; then
     sudo chmod a+x "$tool_path"
-    if [ "$tool" = "composer" ]; then
+    if [ "$tool" = "phive" ]; then
-      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
-    elif [ "$tool" = "phive" ]; then
       add_extension curl "sudo pecl install -f curl" extension >/dev/null 2>&1
       add_extension mbstring "sudo pecl install -f mbstring" extension >/dev/null 2>&1
       add_extension xml "sudo pecl install -f xml" extension >/dev/null 2>&1
     elif [ "$tool" = "cs2pr" ]; then
       sudo sed -i '' 's/exit(9)/exit(0)/' "$tool_path"
-      tr -d '\r' <"$tool_path" | sudo tee "$tool_path.tmp" >/dev/null 2>&1 && sudo mv "$tool_path.tmp" "$tool_path"
+      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
@@ -142,21 +125,11 @@ add_composertool() {
   prefix=$3
   (
     composer global require "$prefix$release" >/dev/null 2>&1 &&
+    sudo ln -sf "$(composer -q global config home)"/vendor/bin/"$tool" /usr/local/bin/"$tool" &&
     add_log "$tick" "$tool" "Added"
   ) || add_log "$cross" "$tool" "Could not setup $tool"
 }
 
-add_blackfire() {
-  sudo mkdir -p usr/local/var/run
-  brew tap blackfireio/homebrew-blackfire >/dev/null 2>&1
-  brew install blackfire-agent >/dev/null 2>&1
-  sudo blackfire-agent --register --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN" >/dev/null 2>&1
-  brew services start blackfire-agent >/dev/null 2>&1
-  sudo blackfire --config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1
-  add_log "$tick" "blackfire" "Added"
-  add_log "$tick" "blackfire-agent" "Added"
-}
-
 # Function to configure PECL
 configure_pecl() {
   for tool in pear pecl; do
@@ -171,75 +144,38 @@ add_pecl() {
   add_log "$tick" "PECL" "Added"
 }
 
-# Function to fetch updated formulas
+# Function to setup PHP and composer
-update_formulae() {
+setup_php_and_composer() {
-  brew_dir=$(brew --prefix)/Homebrew/Library/Taps/homebrew/homebrew-core/Formula
-  for formula in httpd pkg-config apr apr-util argon2 aspell autoconf bison curl-openssl freetds freetype gettext glib gmp icu4c jpeg krb5 libffi libpng libpq libsodium libzip oniguruma openldap openssl@1.1 re2c sqlite tidyp unixodbc webp; do
-    sudo curl -o "$brew_dir"/"$formula".rb -sSL https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/"$formula".rb &
-    to_wait+=( $! )
-  done
-  wait "${to_wait[@]}"
-}
-
-# Function to setup PHP >=5.6
-setup_php() {
-  action=$1
   export HOMEBREW_NO_INSTALL_CLEANUP=TRUE
-  brew tap shivammathur/homebrew-php
+  brew tap shivammathur/homebrew-php >/dev/null 2>&1
-  if brew list php@"$version" 2>/dev/null | grep -q "Error" && [ "$action" != "upgrade" ]; then
+  brew install shivammathur/php/php@"$version" >/dev/null 2>&1
-    brew unlink php@"$version"
+  brew link --force --overwrite php@"$version" >/dev/null 2>&1
-  else
-    if [ "$version" = "8.0" ]; then update_formulae; fi
-    brew "$action" shivammathur/php/php@"$version"
-  fi
-  brew link --force --overwrite php@"$version"
 }
 
 # Variables
 tick="✓"
 cross="✗"
 version=$1
-nodot_version=${1/./}
-old_versions="5.[3-5]"
 tool_path_dir="/usr/local/bin"
-existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
+existing_version=$(php-config --version | cut -c 1-3)
-[[ -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}"
-
-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
-  fi
-  if [[ $(command -v brew) == "" ]]; then
-      step_log "Setup Brew"
-      curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh | bash -s >/dev/null 2>&1
-      add_log "$tick" "Brew" "Installed Homebrew"
-  fi
-fi
 
 # Setup PHP
 step_log "Setup PHP"
-if [[ "$version" =~ $old_versions ]]; then
+if [ "$existing_version" != "$version" ]; then
-  curl -sSL https://github.com/shivammathur/php5-darwin/releases/latest/download/install.sh | bash -s "$nodot_version" >/dev/null 2>&1 &&
+  export HOMEBREW_NO_INSTALL_CLEANUP=TRUE >/dev/null 2>&1
+  brew tap shivammathur/homebrew-php >/dev/null 2>&1
+  brew install shivammathur/php/php@"$version" >/dev/null 2>&1
+  brew link --force --overwrite php@"$version" >/dev/null 2>&1
   status="Installed"
-elif [ "$existing_version" != "$version" ]; then
-  setup_php "install" >/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 "date.timezone=UTC" >>"$ini_file"
-ext_dir=$(php -i | grep -Ei "extension_dir => /" | sed -e "s|.*=> s*||")
+ext_dir=$(php -i | grep -Ei "extension_dir => /(usr|opt)" | 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; fi
+configure_pecl
 add_log "$tick" "PHP" "$status PHP $semver"

src/scripts/ext/blackfire.ps1

@@ -1,35 +0,0 @@
-Param (
-    [Parameter(Position = 0, Mandatory = $true)]
-    [ValidateNotNull()]
-    [string]
-    $version,
-    [Parameter(Position = 1, Mandatory = $true)]
-    [ValidateNotNull()]
-    [string]
-    $extension
-)
-
-$tick = ([char]8730)
-$php_dir = 'C:\tools\php'
-if($env:RUNNER -eq 'self-hosted') { $php_dir = "$php_dir$version" }
-$ext_dir = "$php_dir\ext"
-$arch='x64'
-if ($version -lt '7.0') { $arch='x86' }
-$version = $version.replace('.', '')
-$extension_version = $extension.split('-')[1]
-if ($extension_version -notmatch "\S") {
-    $ext_data = Invoke-WebRequest https://blackfire.io/docs/up-and-running/update | ForEach-Object { $_.tostring() -split "[`r`n]" | Select-String '<td class="version">' | Select-Object -Index 2 }
-    $extension_version = [regex]::Matches($ext_data, '<td.*?>(.+)</td>') | ForEach-Object { $_.Captures[0].Groups[1].value }
-}
-if (Test-Path $ext_dir\blackfire.dll) {
-    Enable-PhpExtension -Extension blackfire -Path $php_dir
-    $status="Enabled"
-} else {
-    $installed = Get-Php -Path $php_dir
-    $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
-    Invoke-WebRequest -UseBasicParsing -Uri "https://packages.blackfire.io/binaries/blackfire-php/${extension_version}/blackfire-php-windows_${arch}-php-${version}${nts}.dll" -OutFile $ext_dir\blackfire.dll > $null 2>&1
-    Enable-PhpExtension -Extension blackfire -Path $php_dir
-    $status="Installed and enabled"
-}
-printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "32" $tick "blackfire" "$status"
-

src/scripts/ext/blackfire.sh

@@ -1,11 +0,0 @@
-version=${1/./}
-extension=${2}
-extension_version=$(echo "$extension" | cut -d '-' -f 2)
-if [ "$extension_version" = "blackfire" ]; then
-  extension_version=$(curl -sSL https://blackfire.io/docs/up-and-running/update | grep 'class="version"' | sed -e 's/<[^>]*>\| //g' | sed -n '3,3p')
-fi
-ext_dir=$(php -i | grep "extension_dir => /" | sed -e "s|.*=> s*||")
-scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
-ini_file="$scan_dir/50-blackfire.ini"
-sudo curl -o $ext_dir/blackfire.so -SL https://packages.blackfire.io/binaries/blackfire-php/$extension_version/blackfire-php-linux_amd64-php-$version.so
-echo "extension=blackfire.so" | sudo tee -a "$ini_file"

src/scripts/ext/blackfire_darwin.sh

@@ -1,11 +0,0 @@
-version=${1/./}
-extension=${2}
-extension_version=$(echo "$extension" | cut -d '-' -f 2)
-if [ "$extension_version" = "blackfire" ]; then
-  extension_version=$(curl -sSL https://blackfire.io/docs/up-and-running/update | grep 'class="version"' | sed -e "s/ //g" | sed -n '3,3p' | cut -d '>' -f 2 | cut -d '<' -f 1)
-fi
-ext_dir=$(php -i | grep -Ei "extension_dir => /usr" | sed -e "s|.*=> s*||")
-scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
-ini_file="$scan_dir/50-blackfire.ini"
-sudo curl -o $ext_dir/blackfire.so -SL https://packages.blackfire.io/binaries/blackfire-php/$extension_version/blackfire-php-darwin_amd64-php-$version.so
-echo "extension=blackfire.so" | sudo tee -a "$ini_file"

src/scripts/ext/phalcon.ps1

@@ -31,8 +31,7 @@ Function Install-Phalcon() {
 $tick = ([char]8730)
 $domain = 'https://github.com'
 $php_dir = 'C:\tools\php'
-if($env:RUNNER -eq 'self-hosted') { $php_dir = "$php_dir$version" }
+$ext_dir = $php_dir + '\ext'
-$ext_dir = "$php_dir\ext"
 $extension_version = $extension.substring($extension.Length - 1)
 
 if($extension_version -eq '4') {

src/scripts/ext/phalcon.sh

@@ -22,6 +22,7 @@ update_ppa() {
 install_phalcon() {
   extension=$1
   version=$2
+  (sudo DEBIAN_FRONTEND=noninteractive apt-get install -y "php$version-$extension" >/dev/null 2>&1 && add_log "$tick" "$extension" "Installed and enabled") ||
   (update_ppa && sudo DEBIAN_FRONTEND=noninteractive apt-get install -y "php$version-$extension" >/dev/null 2>&1 && add_log "$tick" "$extension" "Installed and enabled") ||
   add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
 }
@@ -35,7 +36,7 @@ tick="✓"
 cross="✗"
 
 if [ "$extension_major_version" = "4" ]; then
-  if [ -e "$ext_dir/psr.so" ] && ! php -m | grep -i -q -w psr; then
+  if [ -e "$ext_dir/psr.so" ]; then
     echo "extension=psr.so" | sudo tee -a "$ini_file" >/dev/null 2>&1
   fi
 

src/scripts/ext/phalcon_darwin.sh

@@ -13,7 +13,6 @@ add_log() {
 # Function to install phalcon
 install_phalcon() {
   (
-    sed -i '' '/extension.*psr/d' "$ini_file"
     brew tap shivammathur/homebrew-phalcon >/dev/null 2>&1
     brew install phalcon@"$php_version"_"$extension_major" >/dev/null 2>&1
     sudo cp /usr/local/opt/psr@"$php_version"/psr.so "$ext_dir" >/dev/null 2>&1
@@ -28,17 +27,14 @@ extension=$1
 extension_major=${extension: -1}
 php_version=$2
 semver=$(php -v | head -n 1 | cut -f 2 -d ' ')
-ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
+ini_file=$(php -d "date.timezone=UTC" --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
 ext_dir=$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||")
 if [ -e "$ext_dir/psr.so" ] && [ -e "$ext_dir/phalcon.so" ]; then
-  phalcon_version=$(php -d="extension=psr.so" -d="extension=phalcon.so" -r "echo phpversion('phalcon');" 2>/dev/null | cut -d'.' -f 1)
+  phalcon_version=$(php -d="extension=psr.so" -d="extension=phalcon.so" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
-  if php -m | grep -i -q -w psr; then
-    phalcon_version=$(php -d="extension=phalcon.so" -r "echo phpversion('phalcon');" 2>/dev/null | cut -d'.' -f 1)
-  fi
   if [ "$phalcon_version" != "$extension_major" ]; then
     install_phalcon
   else
-    if ! php -m | grep -i -q -w psr; then echo "extension=psr.so" >>"$ini_file"; fi
+    echo "extension=psr.so" >>"$ini_file"
     echo "extension=phalcon.so" >>"$ini_file"
     add_log "$tick" "$extension" "Enabled"
   fi

src/scripts/ext/xdebug.sh

@@ -0,0 +1,3 @@
+cd ~ && git clone --depth=1 https://github.com/xdebug/xdebug.git
+cd xdebug || echo "Failed to clone Xdebug"
+sudo ./rebuild.sh

src/scripts/ext/xdebug_darwin.sh

@@ -0,0 +1,6 @@
+cd ~ && git clone --depth=1 https://github.com/xdebug/xdebug.git
+cd xdebug || echo "Failed to clone Xdebug"
+sudo phpize
+sudo ./configure
+sudo make
+sudo cp modules/xdebug.so "$(php -i | grep "extension_dir => /opt" | sed -e "s|.*=> s*||")"

src/scripts/linux.sh

@@ -19,39 +19,15 @@ add_log() {
 # Function to update php ppa
 update_ppa() {
   if [ "$ppa_updated" = "false" ]; then
-    sudo "$debconf_fix" apt-get update >/dev/null 2>&1
+    find /etc/apt/sources.list.d -type f -name 'ondrej-ubuntu-php*.list' -exec sudo DEBIAN_FRONTEND=noninteractive apt-fast update -o Dir::Etc::sourcelist="{}" ';' >/dev/null 2>&1
     ppa_updated="true"
   fi
 }
 
-# Function to setup environment for self-hosted runners
-pre_setup() {
-  sudo mkdir -p /var/run /run/php
-  if [ "$runner" = "self-hosted" ]; then
-    if [[ "$version" =~ $old_versions ]] || [ "$version" = "5.3" ]; then
-      add_log "$cross" "PHP" "PHP $version is not supported on self-hosted runner"
-      exit 1
-    fi
-    if ! command -v apt-fast >/dev/null; then
-      sudo ln -sf /usr/bin/apt-get /usr/bin/apt-fast
-    fi
-    update_ppa && $apt_install curl make lsb-release software-properties-common unzip
-    if ! apt-cache policy | grep -q ondrej/php; then
-      LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y && update_ppa
-    fi
-    if [ "$version" = "8.0" ]; then
-      IFS=' ' read -r -a libs <<< "$(echo "aspell curl4-gnutls enchant freetype6 icu jpeg png tidy webp xpm zip" | sed "s/[^ ]*/lib&-dev/g")"
-      $apt_install "${libs[@]}"
-    fi
-  fi
-}
-
-# Function to configure PECL
 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 >/dev/null 2>&1
+      sudo "$tool" config-set php_ini "$ini_file" >/dev/null 2>&1
       sudo "$tool" config-set auto_discover 1 >/dev/null 2>&1
       sudo "$tool" channel-update "$tool".php.net >/dev/null 2>&1
     done
@@ -75,18 +51,13 @@ get_pecl_version() {
 # Function to test if extension is loaded
 check_extension() {
   extension=$1
-  if [ "$extension" != "mysql" ]; then
+  php -m | grep -i -q -w "$extension"
-    php -m | grep -i -q -w "$extension"
-  else
-    php -m | grep -i -q "$extension"
-  fi
 }
 
 # Function to delete extensions
 delete_extension() {
   extension=$1
   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
 }
@@ -94,44 +65,10 @@ delete_extension() {
 # Function to disable and delete extensions
 remove_extension() {
   extension=$1
-  if check_extension "$extension"; then
+  if [ -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"
-      sudo phpdismod -v "$version" "$extension" >/dev/null 2>&1
-    fi
-    delete_extension "$extension"
-    (! 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"
-  fi
-}
-
-# Function to enable existing extension
-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"
-  else
-    read -r ext ext_name <<< "$1 $1"
-    sudo rm -rf "$scan_dir"/*pdo.ini >/dev/null 2>&1 && echo "extension=pdo.so" >> "$ini_file"
-    if [ "$ext" = "mysql" ]; then
-      enable_extension "mysqlnd" "extension"
-      ext_name="mysqli"
-    elif [ "$ext" = "sqlite" ]; then
-      read -r ext ext_name <<< "sqlite3 sqlite3"
-    fi
-    add_extension "$ext_name" "$apt_install php$version-$ext" "extension" >/dev/null 2>&1
-    enable_extension "$pdo_ext" "extension"
-    (check_extension "$pdo_ext" && add_log "$tick" "$pdo_ext" "Enabled") ||
-    add_log "$cross" "$pdo_ext" "Could not install $pdo_ext on PHP $semver"
   fi
+  delete_extension "$extension"
 }
 
 # Function to setup extensions
@@ -139,13 +76,11 @@ add_extension() {
   extension=$1
   install_command=$2
   prefix=$3
-  if [[ "$version" =~ $old_versions ]]; then
+  if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
-    install_command="update_ppa && ${install_command/5\.[4-5]-$extension/5-$extension=$release_version}"
+    echo "$prefix=$extension.so" >>"$ini_file" && add_log "$tick" "$extension" "Enabled"
-  fi
+  elif check_extension "$extension"; then
-  enable_extension "$extension" "$prefix"
-  if check_extension "$extension"; then
     add_log "$tick" "$extension" "Enabled"
-  else
+  elif ! check_extension "$extension"; then
     eval "$install_command" >/dev/null 2>&1 ||
     (update_ppa && eval "$install_command" >/dev/null 2>&1) ||
     sudo pecl install -f "$extension" >/dev/null 2>&1
@@ -161,7 +96,7 @@ add_pecl_extension() {
   pecl_version=$2
   prefix=$3
   if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
-    echo "$prefix=$ext_dir/$extension.so" >>"$pecl_file"
+    echo "$prefix=$ext_dir/$extension.so" >>"$ini_file"
   fi
   ext_version=$(php -r "echo phpversion('$extension');")
   if [ "$ext_version" = "$pecl_version" ]; then
@@ -213,18 +148,12 @@ add_tool() {
     sudo chmod a+x "$tool_path"
     if [ "$tool" = "composer" ]; then
       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
     elif [ "$tool" = "cs2pr" ]; then
       sudo sed -i 's/\r$//; s/exit(9)/exit(0)/' "$tool_path"
     elif [ "$tool" = "phive" ]; then
       add_extension curl "$apt_install php$version-curl" extension >/dev/null 2>&1
       add_extension 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
@@ -239,6 +168,7 @@ add_composertool() {
   prefix=$3
   (
     composer global require "$prefix$release" >/dev/null 2>&1 &&
+    sudo ln -sf "$(composer -q global config home)"/vendor/bin/"$tool" /usr/local/bin/"$tool" &&
     add_log "$tick" "$tool" "Added"
   ) || add_log "$cross" "$tool" "Could not setup $tool"
 }
@@ -246,60 +176,26 @@ add_composertool() {
 # Function to setup phpize and php-config
 add_devtools() {
   if ! [ -e "/usr/bin/phpize$version" ] || ! [ -e "/usr/bin/php-config$version" ]; then
-    update_ppa && $apt_install php"$version"-dev php"$version"-xml >/dev/null 2>&1
+    $apt_install php"$version"-dev php"$version"-xml >/dev/null 2>&1
   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
 }
 
-add_blackfire() {
-  sudo mkdir -p /var/run/blackfire
-  sudo curl -o /tmp/blackfire-gpg.key -sSL https://packages.blackfire.io/gpg.key >/dev/null 2>&1
-  sudo apt-key add /tmp/blackfire-gpg.key >/dev/null 2>&1
-  echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list >/dev/null 2>&1
-  find /etc/apt/sources.list.d -type f -name blackfire.list -exec sudo "$debconf_fix" apt-fast update -o Dir::Etc::sourcelist="{}" ';' >/dev/null 2>&1
-  $apt_install blackfire-agent >/dev/null 2>&1
-  sudo blackfire-agent --register --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN" >/dev/null 2>&1
-  sudo /etc/init.d/blackfire-agent restart >/dev/null 2>&1
-  sudo blackfire --config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1
-  add_log "$tick" "blackfire" "Added"
-  add_log "$tick" "blackfire-agent" "Added"
-}
-
 # Function to setup the nightly build from master branch
 setup_master() {
-  update_ppa && $apt_install libzip-dev libwebp-dev
   tar_file=php_"$version"%2Bubuntu"$(lsb_release -r -s)".tar.xz
   install_dir=~/php/"$version"
-  bintray_url=https://dl.bintray.com/shivammathur/php/"$tar_file"
   sudo mkdir -m 777 -p ~/php
-  if [ ! "$(whoami)" = "runner" ]; then
+  update_ppa && $apt_install libicu64 libicu-dev >/dev/null 2>&1
-    sudo rm -rf /home/runner && sudo ln -sf ~/ /home/runner;
+  curl -SLO https://dl.bintray.com/shivammathur/php/"$tar_file" >/dev/null 2>&1
-  fi
+  sudo tar xf "$tar_file" -C ~/php >/dev/null 2>&1
-  curl -o /tmp/"$tar_file" -sSL "$bintray_url"
+  rm -rf "$tar_file"
-  sudo tar xf /tmp/"$tar_file" -C ~/php
+  sudo ln -sf -S "$version" "$install_dir"/bin/* /usr/bin/
-  for tool_path in "$install_dir"/bin/*; do
-    tool=$(basename "$tool_path")
-    sudo cp "$tool_path" /usr/bin/"$tool$version"
-    sudo update-alternatives --install /usr/bin/"$tool" "$tool" /usr/bin/"$tool$version" 50
-  done
   sudo ln -sf "$install_dir"/etc/php.ini /etc/php.ini
 }
 
-# Function to setup PHP 5.3, PHP 5.4 and PHP 5.5
-setup_old_versions() {
-  dir=php-"$version"
-  tar_file="$dir".tar.xz
-  bintray_url=https://dl.bintray.com/shivammathur/php/"$tar_file"
-  curl -o /tmp/"$tar_file" -sSL "$bintray_url"
-  sudo tar xf /tmp/"$tar_file" -C /tmp
-  sudo chmod a+x /tmp/"$dir"/*.sh
-  (cd /tmp/"$dir" && ./install.sh && ./post-install.sh)
-  configure_pecl
-  release_version=$(php -v | head -n 1 | cut -d' ' -f 2)
-}
-
 # Function to setup PECL
 add_pecl() {
   add_devtools
@@ -328,78 +224,43 @@ php_semver() {
   fi
 }
 
-# Function to update PHP
-update_php() {
-  update_ppa
-  initial_version=$(php_semver)
-  $apt_install php"$version" php"$version"-curl php"$version"-mbstring php"$version"-xml >/dev/null 2>&1
-  updated_version=$(php_semver)
-  if [ "$updated_version" != "$initial_version" ]; then
-    status="Updated to"
-  else
-    status="Switched to"
-  fi
-}
-
 # Variables
 tick="✓"
 cross="✗"
 ppa_updated="false"
 pecl_config="false"
 version=$1
-old_versions="5.[4-5]"
 debconf_fix="DEBIAN_FRONTEND=noninteractive"
 apt_install="sudo $debconf_fix apt-fast install -y"
 tool_path_dir="/usr/local/bin"
-existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
+existing_version=$(php-config --version | cut -c 1-3)
-[[ -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}"
 
 # Setup PHP
 step_log "Setup PHP"
-pre_setup >/dev/null 2>&1
+sudo mkdir -p /var/run
+sudo mkdir -p /run/php
+
 if [ "$existing_version" != "$version" ]; then
   if [ ! -e "/usr/bin/php$version" ]; then
     if [ "$version" = "8.0" ]; then
-      setup_master >/dev/null 2>&1
+      setup_master
-    elif [[ "$version" =~ $old_versions ]] || [ "$version" = "5.3" ]; then
-      setup_old_versions >/dev/null 2>&1
     else
       update_ppa
-      $apt_install php"$version" php"$version"-curl php"$version"-mbstring php"$version"-xml php"$version"-intl >/dev/null 2>&1
+      $apt_install php"$version" php"$version"-curl php"$version"-mbstring php"$version"-xml >/dev/null 2>&1
     fi
     status="Installed"
   else
-    if [ "$update" = "true" ]; then
+    status="Switched to"
-      update_php
-    else
-      status="Switched to"
-    fi
-  fi
-
-  # PHP 5.3 is switched by install script, for rest switch_version
-  if [ "$version" != "5.3" ]; then
-    switch_version
   fi
 
+  switch_version
 else
-  if [ "$update" = "true" ]; then
+  status="Found"
-    update_php
-  else
-    status="Found"
-    if [ "$version" = "8.0" ]; then
-      switch_version
-    fi
-  fi
 fi
 
 semver=$(php_semver)
+ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
 ext_dir=$(php -i | grep "extension_dir => /" | sed -e "s|.*=> s*||")
 scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
-ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
+sudo chmod 777 "$ini_file" "$tool_path_dir"
-pecl_file="$scan_dir"/99-pecl.ini
-sudo touch "$pecl_file" >/dev/null 2>&1
-sudo chmod 777 "$ini_file" "$pecl_file" "$tool_path_dir"
 add_log "$tick" "PHP" "$status PHP $semver"

src/scripts/win32.ps1

@@ -20,48 +20,6 @@ Function Add-Log($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
 }
 
-Function Get-PathFromRegistry {
-  $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" +
-          [System.Environment]::GetEnvironmentVariable("Path","User")
-  if($null -eq (Get-Content $current_profile | findstr 'Get-PathFromRegistry')) {
-    Add-Content -Path $current_profile -Value 'Function Get-PathFromRegistry { $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User") }; Get-PathFromRegistry'
-  }
-}
-
-Function Add-Path {
-  param(
-    [string]$PathItem
-  )
-  $newPath = (Get-ItemProperty -Path 'hkcu:\Environment' -Name PATH).Path.replace("$PathItem;", '')
-  $newPath = $PathItem + ';' + $newPath
-  Set-ItemProperty -Path 'hkcu:\Environment' -Name Path -Value $newPath
-  Get-PathFromRegistry
-}
-
-Function Get-CleanPSProfile {
-  if(-not(Test-Path -LiteralPath $profile)) {
-    New-Item -Path $profile -ItemType "file" -Force
-  }
-  Set-Content $current_profile -Value ''
-  if ($null -eq (Get-Content $profile | FindStr $current_profile.replace('\', '\\'))) {
-    Add-Content $profile -Value ". $current_profile"
-  }
-}
-
-Function Install-PhpManager() {
-  $repo = "mlocati/powershell-phpmanager"
-  $zip_file = "$php_dir\PhpManager.zip"
-  $tags = Invoke-WebRequest https://api.github.com/repos/$repo/tags | ConvertFrom-Json
-  $tag = $tags[0].Name
-  $module_path = "$php_dir\PhpManager\powershell-phpmanager-$tag\PhpManager"
-  Invoke-WebRequest -UseBasicParsing -Uri https://github.com/$repo/archive/$tag.zip -OutFile $zip_file
-  Expand-Archive -Path $zip_file -DestinationPath $php_dir\PhpManager
-  Import-Module $module_path
-  if($null -eq (Get-Content $current_profile | findstr 'powershell-phpmanager')) {
-    Add-Content -Path $current_profile -Value "Import-Module $module_path"
-  }
-}
-
 Function Add-Extension {
   Param (
     [Parameter(Position = 0, Mandatory = $true)]
@@ -73,12 +31,7 @@ Function Add-Extension {
     [ValidateNotNull()]
     [ValidateSet('stable', 'beta', 'alpha', 'devel', 'snapshot')]
     [string]
-    $mininum_stability = 'stable',
+    $mininum_stability = 'stable'
-    [Parameter(Position = 2, Mandatory = $false)]
-    [ValidateNotNull()]
-    [ValidatePattern('^\d+(\.\d+){0,2}$')]
-    [string]
-    $extension_version = ''
   )
   try {
     $extension_info = Get-PhpExtension -Path $php_dir | Where-Object { $_.Name -eq $extension -or $_.Handle -eq $extension }
@@ -97,12 +50,7 @@ Function Add-Extension {
       }
     }
     else {
-      if($extension_version -ne '') {
+      Install-PhpExtension -Extension $extension -MinimumStability $mininum_stability -Path $php_dir
-        Install-PhpExtension -Extension $extension -Version $extension_version -MinimumStability $mininum_stability -Path $php_dir
-      } else {
-        Install-PhpExtension -Extension $extension -MinimumStability $mininum_stability -Path $php_dir
-      }
-
       Add-Log $tick $extension "Installed and enabled"
     }
   }
@@ -120,17 +68,10 @@ Function Remove-Extension() {
     $extension
   )
   if(php -m | findstr -i $extension) {
-    try {
+    Disable-PhpExtension $extension $php_dir
-      Disable-PhpExtension $extension $php_dir
+  }
-      if (Test-Path $ext_dir\php_$extension.dll) {
+  if (Test-Path $ext_dir\php_$extension.dll) {
-        Remove-Item $ext_dir\php_$extension.dll
+    Remove-Item $ext_dir\php_$extension.dll
-      }
-      Add-Log $tick ":$extension" "Removed"
-    } catch {
-      Add-Log $cross ":$extension" "Could not remove $extension on PHP $($installed.FullVersion)"
-    }
-  } else {
-    Add-Log $tick ":$extension" "Could not find $extension on PHP $($installed.FullVersion)"
   }
 }
 
@@ -150,9 +91,12 @@ Function Add-Tool() {
   if (Test-Path $php_dir\$tool) {
     Remove-Item $php_dir\$tool
   }
-  if ($tool -eq "symfony") {
+  if ($tool -eq "composer") {
+    Install-Composer -Scope System -Path $php_dir -PhpPath $php_dir
+    composer -q global config process-timeout 0
+  } elseif ($tool -eq "symfony") {
     Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $php_dir\$tool.exe
-    Add-Content -Path $current_profile -Value "New-Alias $tool $php_dir\$tool.exe" >$null 2>&1
+    Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias $tool $php_dir\$tool.exe" > $null 2>&1
   } else {
     try {
       Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $php_dir\$tool
@@ -162,21 +106,16 @@ Function Add-Tool() {
       $bat_content += "SET BIN_TARGET=%~dp0/" + $tool
       $bat_content += "php %BIN_TARGET% %*"
       Set-Content -Path $php_dir\$tool.bat -Value $bat_content
-      Add-Content -Path $current_profile -Value "New-Alias $tool $php_dir\$tool.bat" >$null 2>&1
+      Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias $tool $php_dir\$tool.bat" > $null 2>&1
     } catch { }
   }
   if($tool -eq "phive") {
+    Add-Extension curl >$null 2>&1
+    Add-Extension mbstring >$null 2>&1
     Add-Extension xml >$null 2>&1
-  } elseif($tool -eq "cs2pr") {
+  }
+  if($tool -eq "cs2pr") {
     (Get-Content $php_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $php_dir/cs2pr
-  } elseif($tool -eq "composer") {
-    composer -q global config process-timeout 0
-    Write-Output "::add-path::$env:APPDATA\Composer\vendor\bin"
-    if (Test-Path env:COMPOSER_TOKEN) {
-      composer -q global config github-oauth.github.com $env:COMPOSER_TOKEN
-    }
-  } elseif($tool -eq "wp-cli") {
-    Copy-Item $php_dir\wp-cli.bat -Destination $php_dir\wp.bat
   }
   if (((Get-ChildItem -Path $php_dir/* | Where-Object Name -Match "^$tool(.exe|.phar)*$").Count -gt 0)) {
     Add-Log $tick $tool "Added"
@@ -205,6 +144,8 @@ Function Add-Composertool() {
   )
   composer -q global require $prefix$release 2>&1 | out-null
   if($?) {
+    $composer_dir = composer -q global config home | ForEach-Object { $_ -replace "/", "\" }
+    Add-Content -Path $PsHome\profile.ps1 -Value "New-Alias $tool $composer_dir\vendor\bin\$tool.bat"
     Add-Log $tick $tool "Added"
   } else {
     Add-Log $cross $tool "Could not setup $tool"
@@ -215,81 +156,37 @@ Function Add-Pecl() {
   Add-Log $tick "PECL" "Use extensions input to setup PECL extensions on windows"
 }
 
-Function Add-Blackfire() {
-  $agent_data = Invoke-WebRequest https://blackfire.io/docs/up-and-running/update | ForEach-Object { $_.tostring() -split "[`r`n]" | Select-String '<td class="version">' | Select-Object -Index 0 }
-  $agent_version = [regex]::Matches($agent_data, '<td.*?>(.+)</td>') | ForEach-Object {$_.Captures[0].Groups[1].value }
-  $url = "https://packages.blackfire.io/binaries/blackfire-agent/${agent_version}/blackfire-agent-windows_${arch_name}.zip"
-  Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $php_dir\blackfire.zip >$null 2>&1
-  Expand-Archive -Path $php_dir\blackfire.zip -DestinationPath $php_dir -Force >$null 2>&1
-  Add-Content -Path $current_profile -Value "New-Alias blackfire $php_dir\blackfire.exe"
-  Add-Content -Path $current_profile -Value "New-Alias blackfire-agent $php_dir\blackfire-agent.exe"
-  if ((Test-Path env:BLACKFIRE_SERVER_ID) -and (Test-Path env:BLACKFIRE_SERVER_TOKEN)) {
-    blackfire-agent --register --server-id=$env:BLACKFIRE_SERVER_ID --server-token=$env:BLACKFIRE_SERVER_TOKEN >$null 2>&1
-  }
-  if ((Test-Path env:BLACKFIRE_CLIENT_ID) -and (Test-Path env:BLACKFIRE_CLIENT_TOKEN)) {
-    blackfire --config --client-id=$env:BLACKFIRE_CLIENT_ID --client-token=$env:BLACKFIRE_CLIENT_TOKEN --ca-cert=$php_dir\ssl\cacert.pem >$null 2>&1
-  }
-  Add-Log $tick "blackfire" "Added"
-  Add-Log $tick "blackfire-agent" "Added"
-}
-
 # Variables
 $tick = ([char]8730)
 $cross = ([char]10007)
 $php_dir = 'C:\tools\php'
-$ext_dir = "$php_dir\ext"
+$ext_dir = $php_dir + '\ext'
-$current_profile = "$env:TEMP\setup-php.ps1"
 $ProgressPreference = 'SilentlyContinue'
 $master_version = '8.0'
-
 $arch = 'x64'
-$arch_name ='amd64'
+$ts = $false
-if(-not([Environment]::Is64BitOperatingSystem) -or $version -lt '7.0') {
+if((Test-Path env:PHPTS) -and $env:PHPTS -eq 'ts') {
-  $arch = 'x86'
+  $ts = $true
-  $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"
-  $ext_dir = "$php_dir\ext"
-  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"
-    exit 1
-  }
-  New-Item $php_dir -Type Directory 2>&1 | Out-Null
-  Add-Path -PathItem $php_dir
-  setx PHPROOT $php_dir >$null 2>&1
-} else {
-  $current_profile = "$PSHOME\Profile.ps1"
-}
 Step-Log "Setup PhpManager"
-Install-PhpManager >$null 2>&1
+Install-Module -Name PhpManager -Force -Scope CurrentUser
 Add-Log $tick "PhpManager" "Installed"
 
-Step-Log "Setup PHP"
 $installed = $null
 if (Test-Path -LiteralPath $php_dir -PathType Container) {
   try {
     $installed = Get-Php -Path $php_dir
-  } catch { }
+  }
+  catch {
+  }
 }
+Step-Log "Setup PHP"
 $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') {
+  if ($version -lt '7.0') {
     Install-Module -Name VcRedist -Force
+    $arch='x86'
   }
   if ($version -eq $master_version) {
     $version = 'master'
@@ -297,24 +194,19 @@ if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version
 
   Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force >$null 2>&1
 } else {
-  if($env:update -eq 'true') {
+  $status = "Found"
-    Update-Php $php_dir >$null 2>&1
-    $status = "Updated to"
-  } else {
-    $status = "Found"
-  }
 }
 
 $installed = Get-Php -Path $php_dir
 Set-PhpIniKey -Key 'date.timezone' -Value 'UTC' -Path $php_dir
-if($version -lt "5.5") {
+Enable-PhpExtension -Extension openssl, curl, opcache -Path $php_dir
-  Enable-PhpExtension -Extension openssl, curl, mbstring -Path $php_dir
-} else {
-  Enable-PhpExtension -Extension openssl, curl, opcache, mbstring -Path $php_dir
-}
 Update-PhpCAInfo -Path $php_dir -Source CurrentUser
 if ($version -eq 'master') {
-  Copy-Item $dir"\..\src\bin\php_$env:PHPTS`_pcov.dll" -Destination $ext_dir"\php_pcov.dll"
+  if($installed.ThreadSafe) {
+    Copy-Item $dir"\..\src\bin\php_ts_pcov.dll" -Destination $ext_dir"\php_pcov.dll"
+  } else {
+    Copy-Item $dir"\..\src\bin\php_pcov.dll" -Destination $ext_dir"\php_pcov.dll"
+  }
   Set-PhpIniKey -Key 'opcache.jit_buffer_size' -Value '256M' -Path $php_dir
   Set-PhpIniKey -Key 'opcache.jit' -Value '1235' -Path $php_dir
 }

src/tools.ts

@@ -4,7 +4,6 @@ import * as utils from './utils';
  * Function to get command to setup tools
  *
  * @param os_version
- * @param suffix
  */
 export async function getCommand(
   os_version: string,
@@ -70,8 +69,6 @@ export async function parseTool(
 /**
  * Function to get the url of tool with the given version
  *
- * @param tool
- * @param extension
  * @param version
  * @param prefix
  * @param version_prefix
@@ -170,14 +167,16 @@ export async function getCodeceptionUri(
     case /(^2\.(1\.[0-5]|0\.\d+)|^1\.[6-8]\.\d+).*/.test(version):
       return codecept;
     default:
-      return codecept;
+      return await codecept;
   }
 }
 
 /**
  * Helper function to get script to setup phive
  *
+ * @param tool
  * @param version
+ * @param url
  * @param os_version
  */
 export async function addPhive(
@@ -205,9 +204,6 @@ export async function addPhive(
 /**
  * Function to get the phar url in domain/tool-version.phar format
  *
- * @param domain
- * @param tool
- * @param prefix
  * @param version
  */
 export async function getPharUrl(
@@ -273,31 +269,10 @@ export async function getSymfonyUri(
   }
 }
 
-/**
- * Function to get the WP-CLI url
- *
- * @param version
- */
-export async function getWpCliUrl(version: string): Promise<string> {
-  switch (version) {
-    case 'latest':
-      return 'wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true';
-    default:
-      return await getUri(
-        'wp-cli',
-        '-' + version + '.phar',
-        version,
-        'wp-cli/wp-cli/releases',
-        'v',
-        'download'
-      );
-  }
-}
-
 /**
  * Function to add/move composer in the tools list
  *
- * @param tools_list
+ * @param tools
  */
 export async function addComposer(tools_list: string[]): Promise<string[]> {
   const regex = /^composer($|:.*)/;
@@ -324,13 +299,10 @@ export async function getCleanedToolsList(
   let tools_list: string[] = await utils.CSVArray(tools_csv);
   tools_list = await addComposer(tools_list);
   tools_list = tools_list
-    .map(function (extension: string) {
+    .map(function(extension: string) {
       return extension
         .trim()
-        .replace(
+        .replace(/robmorgan\/|hirak\/|narrowspark\/automatic-/, '');
-          /symfony\/|laravel\/|robmorgan\/|hirak\/|narrowspark\/automatic-/,
-          ''
-        );
     })
     .filter(Boolean);
   return [...new Set(tools_list)];
@@ -409,8 +381,7 @@ export async function addPackage(
 /**
  * Setup tools
  *
- * @param tools_csv
+ * @param tool_csv
- * @param php_version
  * @param os_version
  */
 export async function addTools(
@@ -420,7 +391,7 @@ export async function addTools(
 ): Promise<string> {
   let script = '\n' + (await utils.stepLog('Setup Tools', os_version));
   const tools_list: Array<string> = await getCleanedToolsList(tools_csv);
-  await utils.asyncForEach(tools_list, async function (release: string) {
+  await utils.asyncForEach(tools_list, async function(release: string) {
     const tool_data: {name: string; version: string} = await parseTool(release);
     const tool: string = tool_data.name;
     const version: string = tool_data.version;
@@ -436,23 +407,11 @@ export async function addTools(
     script += '\n';
     let url = '';
     switch (tool) {
-      case 'blackfire':
-      case 'blackfire-agent':
-        script += await getCommand(os_version, 'blackfire');
-        break;
-      case 'blackfire-player':
-        url = await getPharUrl('https://get.blackfire.io', tool, 'v', version);
-        script += await addArchive(tool, version, url, os_version);
-        break;
       case 'cs2pr':
         uri = await getUri(tool, '', version, 'releases', '', 'download');
         url = github + 'staabm/annotate-pull-request-from-checkstyle/' + uri;
         script += await addArchive(tool, version, url, os_version);
         break;
-      case 'infection':
-        url = github + 'infection/infection/' + uri;
-        script += await addArchive(tool, version, url, os_version);
-        break;
       case 'php-cs-fixer':
         uri = await getUri(tool, '.phar', version, 'releases', 'v', 'download');
         url = github + 'FriendsOfPHP/PHP-CS-Fixer/' + uri;
@@ -500,18 +459,12 @@ export async function addTools(
         url = await getDeployerUrl(version);
         script += await addArchive(tool, version, url, os_version);
         break;
-      case 'flex':
-        script += await addPackage(tool, release, 'symfony/', os_version);
-        break;
       case 'phinx':
         script += await addPackage(tool, release, 'robmorgan/', os_version);
         break;
       case 'prestissimo':
         script += await addPackage(tool, release, 'hirak/', os_version);
         break;
-      case 'vapor-cli':
-        script += await addPackage(tool, release, 'laravel/', os_version);
-        break;
       case 'composer-prefetcher':
         script += await addPackage(
           tool,
@@ -533,10 +486,6 @@ export async function addTools(
         url = github + 'symfony/cli/' + uri;
         script += await addArchive('symfony', version, url, os_version);
         break;
-      case 'wp-cli':
-        url = github + (await getWpCliUrl(version));
-        script += await addArchive(tool, version, url, os_version);
-        break;
       default:
         script += await utils.addLog(
           '$cross',

src/utils.ts

@@ -65,6 +65,7 @@ export async function color(type: string): Promise<string> {
  * @param message
  * @param os_version
  * @param log_type
+ * @param prefix
  */
 export async function log(
   message: string,
@@ -120,7 +121,6 @@ export async function stepLog(
  * @param mark
  * @param subject
  * @param message
- * @param os_version
  */
 export async function addLog(
   mark: string,
@@ -147,8 +147,14 @@ export async function addLog(
  * Read the scripts
  *
  * @param filename
+ * @param version
+ * @param os_version
  */
-export async function readScript(filename: string): Promise<string> {
+export async function readScript(
+  filename: string,
+  version: string,
+  os_version: string
+): Promise<string> {
   return fs.readFileSync(
     path.join(__dirname, '../src/scripts/' + filename),
     'utf8'
@@ -159,6 +165,7 @@ export async function readScript(filename: string): Promise<string> {
  * Write final script which runs
  *
  * @param filename
+ * @param version
  * @param script
  */
 export async function writeScript(
@@ -186,10 +193,9 @@ export async function extensionArray(
     default:
       return extension_csv
         .split(',')
-        .map(function (extension: string) {
+        .map(function(extension: string) {
           return extension
             .trim()
-            .toLowerCase()
             .replace('php-', '')
             .replace('php_', '');
         })
@@ -211,7 +217,7 @@ export async function CSVArray(values_csv: string): Promise<Array<string>> {
     default:
       return values_csv
         .split(',')
-        .map(function (value: string) {
+        .map(function(value: string) {
           return value.trim();
         })
         .filter(Boolean);

tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     /* Basic Options */
     // "incremental": true,                   /* Enable incremental compilation */
-    "target": "ES2020",                       /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
+    "target": "es6",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
     "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
     // "allowJs": true,                       /* Allow javascript files to be compiled. */
     // "checkJs": true,                       /* Report errors in .js files. */