Fix support for pecl pdo extensions on Ubuntu

2.4.3

.github/SECURITY.md

@@ -7,7 +7,7 @@ The following versions of this project are supported for security updates.
 | Version | Supported          |
 | ------- | ------------------ |
 | 1.9.x   | :white_check_mark: |
-| 2.3.x   | :white_check_mark: |
+| 2.4.x   | :white_check_mark: |
 
 ## Supported PHP Versions
 

.github/workflows/node-workflow.yml

@@ -48,4 +48,4 @@ jobs:
       - name: Send Coverage
         continue-on-error: true
         timeout-minutes: 1
-        run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/clover.xml -n github-actions-codecov-${{ matrix.operating-system }}-php${{ matrix.php-versions }}
+        run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/clover.xml -n github-actions-codecov-${{ matrix.operating-system }}

.github/workflows/workflow.yml

@@ -1,5 +1,6 @@
 name: Main workflow
 on:
+  workflow_dispatch:
   pull_request:
     branches:
       - master
@@ -27,7 +28,7 @@ jobs:
         php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
     env:
       extensions: xml, opcache, xdebug, pcov
-      key: cache-v2
+      key: cache-v3
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -71,6 +72,7 @@ jobs:
           php -r "if(phpversion()>=7.1 && ! extension_loaded('pcov')) {throw new Exception('PCOV not found');}"
       - name: Testing ini values
         run: |
+          php -r "if(ini_get('memory_limit')!='-1') {throw new Exception('memory_limit not disabled');}"
           php -r "if(ini_get('post_max_size')!='256M') {throw new Exception('post_max_size not added');}"
           php -r "if(ini_get('short_open_tag')!=1) {throw new Exception('short_open_tag not added');}"
           php -r "if(ini_get('date.timezone')!='Asia/Kolkata') {throw new Exception('date.timezone not added');}"

README.md

@@ -11,6 +11,7 @@
   <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="https://twitter.com/setup_php" title="setup-php twitter"><img alt="setup-php twitter" src="https://img.shields.io/badge/twitter-follow-1DA1F2?logo=twitter"></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.
@@ -132,7 +133,7 @@ with:
   extensions: xdebug-beta
 ```
 
-- Non-default extensions can be removed by prefixing it with a `:`.
+- Shared extensions can be removed by prefixing them with a `:`.
 
 ```yaml
 uses: shivammathur/setup-php@v2
@@ -143,13 +144,13 @@ with:
 
 - 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.
+- These extensions have custom support - `cubrid`, `pdo_cubrid` and `gearman` on `Ubuntu`, and `blackfire`, `ioncube`, `oci8`, `pdo_oci`, `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`, `phan`, `phinx`, `phive`, `phpcbf`, `phpcpd`, `php-config`, `php-cs-fixer`, `phpcs`, `phpize`, `phpmd`, `phpstan`, `phpunit`, `prestissimo`, `psalm`, `symfony`, `vapor-cli`
+`blackfire`, `blackfire-player`, `codeception`, `composer`, `composer-normalize`, `composer-prefetcher`, `composer-require-checker`, `composer-unused`, `cs2pr`, `deployer`, `flex`, `grpc_php_plugin`, `infection`, `pecl`, `phan`, `phinx`, `phive`, `phpcbf`, `phpcpd`, `php-config`, `php-cs-fixer`, `phpcs`, `phpize`, `phpmd`, `phpstan`, `phpunit`, `prestissimo`, `protoc`, `psalm`, `symfony`, `vapor-cli`
 
 ```yaml
 uses: shivammathur/setup-php@v2
@@ -178,7 +179,8 @@ with:
 ```
 
 **Notes**
-- Both agent `blackfire-agent` and client `blackfire` are setup when `blackfire` is specified.
+- Latest versions of both agent `blackfire-agent` and client `blackfire` are setup when `blackfire` is specified in tools input.
+- If you have a tool in your `composer.json`, do not setup it globally using this action as the two instances of the tool might conflict.
 - Tools which cannot be setup gracefully leave an error message in the logs, the action is not interrupted.
 
 ## :signal_strength: Coverage Support
@@ -315,7 +317,7 @@ jobs:
 
 - This version is currently in development.
 - `PECL` is installed by default with this version on `ubuntu` and `macOS`.
-- Some extensions might not support this version currently.
+- Some user space extensions might not support this version currently.
 - Refer to this [RFC](https://wiki.php.net/rfc/jit "PHP JIT RFC configuration") for configuring `PHP JIT` on this version.
 - Refer to this [list of RFCs](https://wiki.php.net/rfc#php_80 "List of RFCs implemented in PHP8") implemented in this version.
 
@@ -364,6 +366,10 @@ jobs:
         runner: self-hosted # Specify the runner.
 ```
 
+**Notes**
+- Do not setup multiple self-hosted runners on the a single server instance as parallel workflow will conflict with each other.
+- Do not setup self-hosted runners on the side on your development environment or your production server.
+
 ### Local Testing Setup
 
 > Test your `Ubuntu` workflow locally using [`nektos/act`](https://github.com/nektos/act "Project to test GitHub Actions locally").
@@ -455,45 +461,8 @@ To debug any issues, you can use the `verbose` tag instead of `v2`.
 
 ### 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: extcache
-  uses: shivammathur/cache-extensions@v1
-  with:
-    php-version: ${{ matrix.php-versions }}
-    extensions: ${{ env.extensions }}
-    key: ${{ env.key }}
-
-- name: Cache extensions
-  uses: actions/cache@v2
-  with:
-    path: ${{ steps.extcache.outputs.dir }}
-    key: ${{ steps.extcache.outputs.key }}
-    restore-keys: ${{ steps.extcache.outputs.key }}
-
-- name: Setup PHP
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: ${{ matrix.php-versions }}
-    extensions: ${{ env.extensions }}
-```
-
-**Note:** If you setup both `TS` and `NTS` PHP versions on `windows`, add `${{ env.phpts }}` to `key` and `restore-keys` inputs in `actions/cache` step.
+You can cache PHP extensions using `shivammathur/cache-extensions` and `action/cache` GitHub Actions. Extensions which take very long to setup when cached are available in the next workflow run and are enabled directly. This reduces the workflow execution time.  
+Refer to [`shivammathur/cache-extensions`](https://github.com/shivammathur/cache-extensions "GitHub Action to cache php extensions") for details. 
 
 ### Cache Composer Dependencies
 
@@ -544,7 +513,7 @@ If your project has node.js dependencies, you can persist npm's or yarn's cache
 
 ### 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.
+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 an `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
@@ -634,7 +603,8 @@ Examples of using `setup-php` with various PHP Frameworks and Packages.
 ## :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.
+- This project has multiple [dependencies](#package-dependencies "Dependencies for this PHP Action"). Their licenses can be found in their respective repositories.
+- The logo for `setup-php` is a derivative work of [php.net logo](https://www.php.net/download-logos.php) and is licensed under the [CC BY-SA 4.0 License](https://creativecommons.org/licenses/by-sa/4.0/ "Creative Commons License").
 
 ## :+1: Contributions
 
@@ -645,12 +615,21 @@ Examples of using `setup-php` with various PHP Frameworks and Packages.
 
 ## :sparkling_heart: Support This Project
 
-If this action helped you.
+- Please star the project and share it. If you blog, please share your experience of using this action.
+- Please consider supporting our work by sponsoring using [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal") or by subscribing on [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon").
+- If you use `setup-php` at your company, please [reach out](mailto:contact@setup-php.com) to sponsor the project.
 
-- Sponsor the project by subscribing on [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon") or by contributing using [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal").
-- Please star the project and share it with the community.
-- If you blog, write about your experience of using this action.
-- If you need any help using this, please contact me using [Codementor](https://www.codementor.io/shivammathur "Shivam Mathur Codementor")
+*Huge thanks to the following companies for supporting `setup-php`*
+
+<p> 
+  <a href="https://www.jetbrains.com/?from=setup-php">
+    <img src="https://shivammathur.com/jetbrains.svg" alt="JetBrains" width="150" height="85">
+  </a>  
+  <img src="https://shivammathur.com/blank.svg" alt="spacer" width="40" height="85">  
+  <a href="https://tidelift.com/subscription/pkg/npm-setup-php">  
+    <img src="https://shivammathur.com/tidelift.png" alt="Tidelift" width="100" height="85">
+  </a>
+</p>
 
 ## :package: Dependencies
 
@@ -659,9 +638,12 @@ If this action helped you.
 - [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 on MacOS")
+- [shivammathur/composer-cache](https://github.com/shivammathur/composer-cache "Cache composer releases")
 - [shivammathur/homebrew-extensions](https://github.com/shivammathur/homebrew-extensions "Tap for PHP extensions on MacOS")
-- [shivammathur/php-builder](https://github.com/shivammathur/php-builder "Nightly PHP package")
+- [shivammathur/homebrew-php](https://github.com/shivammathur/homebrew-php "Tap for PHP builds on MacOS")
+- [shivammathur/php-builder](https://github.com/shivammathur/php-builder "Nightly PHP package for Ubuntu")
+- [shivammathur/php-builder-windows](https://github.com/shivammathur/php-builder-windows "Nightly PHP package for Windows")
+- [shivammathur/php-ubuntu](https://github.com/shivammathur/php-ubuntu "Cache stable PHP Packages for Ubuntu")
 - [shivammathur/php5-darwin](https://github.com/shivammathur/php5-darwin "Scripts to setup PHP5 versions on darwin")
 - [shivammathur/php5-ubuntu](https://github.com/shivammathur/php5-ubuntu "Scripts to setup PHP5 versions on ubuntu")
 

__tests__/extensions.test.ts

@@ -1,15 +1,9 @@
 import * as extensions from '../src/extensions';
 
 describe('Extension tests', () => {
-  it('checking getXdebugVersion', async () => {
-    expect(await extensions.getXdebugVersion('5.3')).toContain('2.2.7');
-    expect(await extensions.getXdebugVersion('5.4')).toContain('2.4.1');
-    expect(await extensions.getXdebugVersion('5.5')).toContain('2.5.5');
-    expect(await extensions.getXdebugVersion('5.6')).toContain('2.9.6');
-  });
   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, sqlite, :intl, phalcon4, ioncube, oci8, pdo_oci, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2',
       '7.4',
       'win32'
     );
@@ -17,11 +11,19 @@ describe('Extension tests', () => {
     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-Phalcon phalcon4');
+    expect(win32).toContain('Add-Ioncube');
+    expect(win32).toContain('Add-Oci oci8');
+    expect(win32).toContain('Add-Oci pdo_oci');
     expect(win32).toContain('Add-Extension ast beta');
     expect(win32).toContain('Add-Extension grpc stable 1.2.3');
     expect(win32).toContain('Add-Extension inotify alpha 1.2.3');
 
+    win32 = await extensions.addExtension('pcov', '5.6', 'win32');
+    expect(win32).toContain(
+      'Add-Log "$cross" "pcov" "pcov is not supported on PHP 5.6"'
+    );
+
     win32 = await extensions.addExtension('mysql', '7.4', 'win32');
     expect(win32).toContain('Add-Extension mysqli');
     expect(win32).toContain('Add-Extension mysqlnd');
@@ -41,17 +43,17 @@ describe('Extension tests', () => {
       'win32',
       true
     );
-    expect(win32).toContain('phalcon.ps1 phalcon3');
+    expect(win32).toContain('Add-Phalcon phalcon3');
     expect(win32).toContain('Add-Extension does_not_exist');
 
     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');
+    expect(win32).toContain('Add-Blackfire blackfire');
 
     win32 = await extensions.addExtension('blackfire-1.31.0', '7.3', 'win32');
-    expect(win32).toContain('blackfire.ps1 7.3 blackfire-1.31.0');
+    expect(win32).toContain('Add-Blackfire blackfire-1.31.0');
   });
 
   it('checking addExtensionOnLinux', async () => {
@@ -60,7 +62,6 @@ describe('Extension tests', () => {
       '7.4',
       'linux'
     );
-    expect(linux).toContain('update_extension xdebug 2.9.6');
     expect(linux).toContain(
       'add_extension_from_source xdebug xdebug/xdebug master --enable-xdebug zend_extension'
     );
@@ -84,37 +85,45 @@ describe('Extension tests', () => {
       'sudo $debconf_fix apt-get install -y php8.0-xdebug'
     );
 
+    linux = await extensions.addExtension('pcov', '5.6', 'linux');
+    expect(linux).toContain(
+      'add_log "$cross" "pcov" "pcov is not supported on PHP 5.6"'
+    );
+
     linux = await extensions.addExtension('gearman', '7.0', 'linux');
-    expect(linux).toContain('gearman.sh 7.0');
-    linux = await extensions.addExtension('gearman', '7.1', 'linux');
-    expect(linux).toContain('gearman.sh 7.1');
-
-    linux = await extensions.addExtension('gearman', '7.2', 'linux');
-    expect(linux).toContain('gearman.sh 7.2');
-
-    linux = await extensions.addExtension('gearman', '7.3', 'linux');
-    expect(linux).toContain('gearman.sh 7.3');
-
+    expect(linux).toContain('add_gearman');
     linux = await extensions.addExtension('gearman', '7.4', 'linux');
-    expect(linux).toContain('gearman.sh 7.4');
+    expect(linux).toContain('add_gearman');
+
+    linux = await extensions.addExtension('pdo_cubrid', '7.0', 'linux');
+    expect(linux).toContain('add_cubrid pdo_cubrid');
+    linux = await extensions.addExtension('cubrid', '7.4', 'linux');
+    expect(linux).toContain('add_cubrid cubrid');
 
     linux = await extensions.addExtension('xdebug', '7.2', 'fedora');
     expect(linux).toContain('Platform fedora is not supported');
 
     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');
+    expect(linux).toContain('add_phalcon phalcon3');
+    expect(linux).toContain('add_phalcon phalcon4');
+
+    linux = await extensions.addExtension('ioncube', '7.3', 'linux');
+    expect(linux).toContain('add_ioncube');
+
+    linux = await extensions.addExtension('oci8, pdo_oci', '7.3', 'linux');
+    expect(linux).toContain('add_oci oci8');
+    expect(linux).toContain('add_oci pdo_oci');
 
     linux = await extensions.addExtension('blackfire', '7.3', 'linux');
-    expect(linux).toContain('blackfire.sh 7.3 blackfire');
+    expect(linux).toContain('add_blackfire blackfire');
 
     linux = await extensions.addExtension('blackfire-1.31.0', '7.3', 'linux');
-    expect(linux).toContain('blackfire.sh 7.3 blackfire-1.31.0');
+    expect(linux).toContain('add_blackfire blackfire-1.31.0');
   });
 
   it('checking addExtensionOnDarwin', async () => {
     let darwin: string = await extensions.addExtension(
-      'Xdebug, pcov, grpc, protobuf, swoole, sqlite, :intl, ast-beta, grpc-1.2.3',
+      'Xdebug, pcov, grpc, protobuf, swoole, sqlite, oci8, pdo_oci, :intl, ast-beta, grpc-1.2.3',
       '7.2',
       'darwin'
     );
@@ -123,32 +132,32 @@ describe('Extension tests', () => {
     expect(darwin).toContain('add_brew_extension grpc');
     expect(darwin).toContain('add_brew_extension protobuf');
     expect(darwin).toContain('add_brew_extension swoole');
-    expect(darwin).toContain('sudo pecl install -f sqlite3');
+    expect(darwin).toContain('pecl_install 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');
+    expect(darwin).toContain('add_phalcon phalcon3');
 
     darwin = await extensions.addExtension('phalcon4', '7.3', 'darwin');
-    expect(darwin).toContain('phalcon_darwin.sh phalcon4 7.3');
+    expect(darwin).toContain('add_phalcon phalcon4');
+
+    darwin = await extensions.addExtension('ioncube', '7.3', 'darwin');
+    expect(darwin).toContain('add_ioncube');
+
+    darwin = await extensions.addExtension('oci8, pdo_oci', '7.3', 'darwin');
+    expect(darwin).toContain('add_oci oci8');
+    expect(darwin).toContain('add_oci pdo_oci');
 
     darwin = await extensions.addExtension('pcov', '5.6', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f pcov');
+    expect(darwin).toContain(
+      'add_log "$cross" "pcov" "pcov is not supported on PHP 5.6"'
+    );
 
     darwin = await extensions.addExtension('pcov', '7.2', 'darwin');
     expect(darwin).toContain('add_brew_extension 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('add_brew_extension xdebug');
 
@@ -159,24 +168,24 @@ describe('Extension tests', () => {
     expect(darwin).toContain('add_brew_extension xdebug');
 
     darwin = await extensions.addExtension('redis', '5.6', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f redis-2.2.8');
+    expect(darwin).toContain('pecl_install redis-2.2.8');
 
     darwin = await extensions.addExtension('redis', '7.2', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f redis');
+    expect(darwin).toContain('pecl_install redis');
 
     darwin = await extensions.addExtension('imagick', '5.6', 'darwin');
     expect(darwin).toContain('brew install pkg-config imagemagick');
-    expect(darwin).toContain('sudo pecl install -f imagick');
+    expect(darwin).toContain('pecl_install imagick');
 
     darwin = await extensions.addExtension('imagick', '7.4', 'darwin');
     expect(darwin).toContain('brew install pkg-config imagemagick');
-    expect(darwin).toContain('sudo pecl install -f imagick');
+    expect(darwin).toContain('pecl_install imagick');
 
     darwin = await extensions.addExtension('blackfire', '7.3', 'darwin');
-    expect(darwin).toContain('blackfire_darwin.sh 7.3 blackfire');
+    expect(darwin).toContain('add_blackfire blackfire');
 
     darwin = await extensions.addExtension('blackfire-1.31.0', '7.3', 'darwin');
-    expect(darwin).toContain('blackfire_darwin.sh 7.3 blackfire-1.31.0');
+    expect(darwin).toContain('add_blackfire blackfire-1.31.0');
 
     darwin = await extensions.addExtension(
       'does_not_exist',

__tests__/install.test.ts

@@ -26,12 +26,12 @@ jest.mock('../src/install', () => ({
       if (extension_csv) {
         script += 'install extensions';
       }
-      if (ini_values_csv) {
-        script += 'edit php.ini';
-      }
       if (coverage_driver) {
         script += 'set coverage driver';
       }
+      if (ini_values_csv) {
+        script += 'edit php.ini';
+      }
 
       return script;
     }

__tests__/tools.test.ts

@@ -1,15 +1,6 @@
 import * as tools from '../src/tools';
 
 describe('Tools tests', () => {
-  it('checking getCommand', async () => {
-    expect(await tools.getCommand('linux', 'tool')).toBe('add_tool ');
-    expect(await tools.getCommand('darwin', 'tool')).toBe('add_tool ');
-    expect(await tools.getCommand('win32', 'tool')).toBe('Add-Tool ');
-    expect(await tools.getCommand('fedora', 'tool')).toContain(
-      'Platform fedora is not supported'
-    );
-  });
-
   it('checking parseToolVersion', async () => {
     expect(await tools.getToolVersion('latest')).toBe('latest');
     expect(await tools.getToolVersion('1.2.3')).toBe('1.2.3');
@@ -239,20 +230,24 @@ describe('Tools tests', () => {
     ).toStrictEqual(['composer:2', 'a', 'b', 'c']);
   });
 
-  it('checking updateComposer', async () => {
-    expect(await tools.updateComposer('latest', 'linux')).toContain('');
-    expect(await tools.updateComposer('stable', 'win32')).toContain('');
-    expect(await tools.updateComposer('snapshot', 'darwin')).toContain(
-      '\ncomposer self-update --snapshot'
+  it('checking getComposerUrl', async () => {
+    expect(await tools.getComposerUrl('latest')).toContain(
+      'https://getcomposer.org/composer-stable.phar'
     );
-    expect(await tools.updateComposer('preview', 'linux')).toContain(
-      '\ncomposer self-update --preview'
+    expect(await tools.getComposerUrl('stable')).toContain(
+      'https://getcomposer.org/composer-stable.phar'
     );
-    expect(await tools.updateComposer('1', 'win32')).toContain(
-      '\ncomposer self-update --1'
+    expect(await tools.getComposerUrl('snapshot')).toContain(
+      'https://getcomposer.org/composer.phar'
     );
-    expect(await tools.updateComposer('2', 'darwin')).toContain(
-      '\ncomposer self-update --2'
+    expect(await tools.getComposerUrl('preview')).toContain(
+      'https://getcomposer.org/composer-preview.phar'
+    );
+    expect(await tools.getComposerUrl('1')).toContain(
+      'https://getcomposer.org/composer-1.phar'
+    );
+    expect(await tools.getComposerUrl('2')).toContain(
+      'https://getcomposer.org/composer-2.phar'
     );
   });
 
@@ -384,7 +379,7 @@ describe('Tools tests', () => {
 
   it('checking addTools on linux', async () => {
     const script: string = await tools.addTools(
-      'blackfire, blackfire-player, cs2pr, flex, php-cs-fixer, phplint, phpstan, phpunit, pecl, phinx, phinx:1.2.3, phive, php-config, phpize, symfony, wp-cli',
+      'blackfire, blackfire-player, cs2pr, flex, grpc_php_plugin, php-cs-fixer, phplint, phpstan, phpunit, pecl, phinx, phinx:1.2.3, phive, php-config, phpize, protoc, symfony, wp-cli',
       '7.4',
       'linux'
     );
@@ -393,7 +388,7 @@ describe('Tools tests', () => {
       'add_tool https://get.blackfire.io/blackfire-player.phar blackfire-player'
     );
     expect(script).toContain(
-      'add_tool https://getcomposer.org/composer-stable.phar composer'
+      'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-stable.phar,https://getcomposer.org/composer-stable.phar composer'
     );
     expect(script).toContain(
       'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr'
@@ -416,6 +411,8 @@ describe('Tools tests', () => {
     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_protoc latest');
+    expect(script).toContain('add_grpc_php_plugin latest');
     expect(script).toContain('add_pecl');
     expect(script).toContain('add_composertool flex flex symfony/');
     expect(script).toContain('add_composertool phinx phinx robmorgan/');
@@ -426,17 +423,56 @@ describe('Tools tests', () => {
     expect(script).toContain('add_log "$tick" "phpize" "Added"');
   });
   it('checking addTools on darwin', async () => {
+    const listOfTools = [
+      'blackfire',
+      'blackfire-player',
+      'composer-normalize',
+      'composer-prefetcher:1.2.3',
+      'composer-require-checker',
+      'composer-unused',
+      'cs2pr:1.2.3',
+      'flex',
+      'grpc_php_plugin:1.2.3',
+      'infection',
+      'phan',
+      'phan:2.7.2',
+      'phinx',
+      'phive:1.2.3',
+      'php-config',
+      'phpcbf',
+      'phpcpd',
+      'phpcs',
+      'phpize',
+      'phpmd',
+      'protoc:v1.2.3',
+      'psalm',
+      'symfony',
+      'symfony:1.2.3',
+      'vapor-cli',
+      'wp-cli'
+    ];
+
     const script: string = await tools.addTools(
-      'blackfire, blackfire-player, flex, infection, phan, phpcs, phpcbf, phpcpd, phpmd, psalm, phinx, vapor-cli, phan:2.7.2, phive:1.2.3, cs2pr:1.2.3, composer-prefetcher:1.2.3, phpize, php-config, symfony, symfony:1.2.3, wp-cli',
+      listOfTools.join(', '),
       '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'
+      'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-stable.phar,https://getcomposer.org/composer-stable.phar composer'
+    );
+    expect(script).toContain(
+      'add_tool https://github.com/ergebnis/composer-normalize/releases/latest/download/composer-normalize.phar composer-normalize'
+    );
+    expect(script).toContain(
+      'add_tool https://github.com/maglnet/ComposerRequireChecker/releases/latest/download/composer-require-checker.phar composer-require-checker'
+    );
+    expect(script).toContain(
+      'add_tool https://github.com/composer-unused/composer-unused/releases/latest/download/composer-unused.phar composer-unused'
     );
     expect(script).toContain(
       'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/download/1.2.3/cs2pr cs2pr'
@@ -462,6 +498,8 @@ describe('Tools tests', () => {
     expect(script).toContain(
       'https://github.com/vimeo/psalm/releases/latest/download/psalm.phar psalm'
     );
+    expect(script).toContain('add_grpc_php_plugin 1.2.3');
+    expect(script).toContain('add_protoc 1.2.3');
     expect(script).toContain('add_composertool vapor-cli vapor-cli laravel/');
     expect(script).toContain('add_composertool flex flex symfony/');
     expect(script).toContain('add_composertool phinx phinx robmorgan/');
@@ -487,17 +525,36 @@ describe('Tools tests', () => {
     expect(script).toContain('add_log "$tick" "php-config" "Added"');
   });
   it('checking addTools on windows', async () => {
+    const listOfTools = [
+      'blackfire',
+      'blackfire-player:1.8.1',
+      'codeception',
+      'cs2pr',
+      'deployer',
+      'does_not_exist',
+      'flex',
+      'phinx',
+      'phive:0.13.2',
+      'php-config',
+      'phpize',
+      'phpmd',
+      'prestissimo',
+      'symfony',
+      'wp-cli'
+    ];
+
     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',
+      listOfTools.join(', '),
       '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'
+      'Add-Tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-stable.phar,https://getcomposer.org/composer-stable.phar composer'
     );
     expect(script).toContain(
       'Add-Tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr'
@@ -522,17 +579,23 @@ describe('Tools tests', () => {
     );
     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');
-    expect(script).toContain('Tool does_not_exit is not supported');
+    expect(script).toContain('Tool does_not_exist is not supported');
   });
   it('checking addTools with composer tool using user/tool as input', async () => {
+    const listOfTools = [
+      'hirak/prestissimo',
+      'narrowspark/automatic-composer-prefetcher',
+      'robmorgan/phinx'
+    ];
+
     const script: string = await tools.addTools(
-      'hirak/prestissimo, narrowspark/automatic-composer-prefetcher, robmorgan/phinx',
+      listOfTools.join(', '),
       '7.4',
       'win32'
     );
+
     expect(script).toContain(
-      'Add-Tool https://getcomposer.org/composer-stable.phar composer'
+      'Add-Tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-stable.phar,https://getcomposer.org/composer-stable.phar composer'
     );
     expect(script).toContain('Add-Composertool prestissimo prestissimo hirak/');
     expect(script).toContain('Add-Composertool phinx phinx robmorgan/');
@@ -541,23 +604,29 @@ describe('Tools tests', () => {
     );
   });
   it('checking composer setup', async () => {
+    const listOfTools = ['composer', 'composer:v1'];
+
     let script: string = await tools.addTools(
-      'composer, composer:v1',
+      listOfTools.join(', '),
       '7.4',
       'linux'
     );
+
     expect(script).toContain(
-      'add_tool https://getcomposer.org/composer-stable.phar composer'
+      'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-1.phar,https://getcomposer.org/composer-1.phar composer'
     );
-    expect(script).toContain('composer self-update --1');
 
     script = await tools.addTools('composer:preview', '7.4', 'linux');
-    expect(script).toContain('composer self-update --preview');
+    expect(script).toContain(
+      'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-preview.phar,https://getcomposer.org/composer-preview.phar composer'
+    );
     script = await tools.addTools(
       'composer:v1, composer:preview, composer:snapshot',
       '7.4',
       'linux'
     );
-    expect(script).toContain('composer self-update --snapshot');
+    expect(script).toContain(
+      'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-snapshot.phar,https://getcomposer.org/composer.phar composer'
+    );
   });
 });

__tests__/utils.test.ts

@@ -167,4 +167,45 @@ describe('Utils tests', () => {
       'Platform fedora is not supported'
     );
   });
+
+  it('checking getUnsupportedLog', async () => {
+    expect(await utils.getUnsupportedLog('ext', '5.6', 'linux')).toContain(
+      'add_log "$cross" "ext" "ext is not supported on PHP 5.6"'
+    );
+  });
+
+  it('checking getCommand', async () => {
+    expect(await utils.getCommand('linux', 'tool')).toBe('add_tool ');
+    expect(await utils.getCommand('darwin', 'tool')).toBe('add_tool ');
+    expect(await utils.getCommand('win32', 'tool')).toBe('Add-Tool ');
+    expect(await utils.getCommand('fedora', 'tool')).toContain(
+      'Platform fedora is not supported'
+    );
+  });
+
+  it('checking joins', async () => {
+    expect(await utils.joins('a', 'b', 'c')).toBe('a b c');
+  });
+
+  it('checking scriptExtension', async () => {
+    expect(await utils.scriptExtension('linux')).toBe('.sh');
+    expect(await utils.scriptExtension('darwin')).toBe('.sh');
+    expect(await utils.scriptExtension('win32')).toBe('.ps1');
+    expect(await utils.scriptExtension('fedora')).toContain(
+      'Platform fedora is not supported'
+    );
+  });
+
+  it('checking customPackage', async () => {
+    const script_path: string = path.join('ext', 'pkg.sh');
+    expect(await utils.customPackage('pkg', 'ext', '1.2.3', 'linux')).toContain(
+      script_path + '\nadd_pkg 1.2.3'
+    );
+    expect(
+      await utils.customPackage('pdo_pkg', 'ext', '1.2.3', 'linux')
+    ).toContain(script_path + '\nadd_pkg 1.2.3');
+    expect(
+      await utils.customPackage('pkg8', 'ext', '1.2.3', 'linux')
+    ).toContain(script_path + '\nadd_pkg 1.2.3');
+  });
 });

dist/index.js

@@ -1035,7 +1035,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.suppressOutput = exports.getExtensionPrefix = exports.CSVArray = exports.extensionArray = exports.writeScript = exports.readScript = exports.addLog = exports.stepLog = exports.log = exports.color = exports.asyncForEach = exports.getInput = void 0;
+exports.customPackage = exports.scriptExtension = exports.joins = exports.getCommand = exports.getUnsupportedLog = exports.suppressOutput = exports.getExtensionPrefix = exports.CSVArray = exports.extensionArray = exports.writeScript = exports.readScript = exports.addLog = exports.stepLog = exports.log = exports.color = exports.asyncForEach = exports.getInput = void 0;
 const fs = __importStar(__webpack_require__(747));
 const path = __importStar(__webpack_require__(622));
 const core = __importStar(__webpack_require__(470));
@@ -1250,6 +1250,79 @@ async function suppressOutput(os_version) {
     }
 }
 exports.suppressOutput = suppressOutput;
+/**
+ * Function to get script to log unsupported extensions.
+ *
+ * @param extension
+ * @param version
+ * @param os_version
+ */
+async function getUnsupportedLog(extension, version, os_version) {
+    return ('\n' +
+        (await addLog('$cross', extension, [extension, 'is not supported on PHP', version].join(' '), os_version)) +
+        '\n');
+}
+exports.getUnsupportedLog = getUnsupportedLog;
+/**
+ * Function to get command to setup tools
+ *
+ * @param os_version
+ * @param suffix
+ */
+async function getCommand(os_version, suffix) {
+    switch (os_version) {
+        case 'linux':
+        case 'darwin':
+            return 'add_' + suffix + ' ';
+        case 'win32':
+            return 'Add-' + suffix.charAt(0).toUpperCase() + suffix.slice(1) + ' ';
+        default:
+            return await log('Platform ' + os_version + ' is not supported', os_version, 'error');
+    }
+}
+exports.getCommand = getCommand;
+/**
+ * Function to join strings with space
+ *
+ * @param str
+ */
+async function joins(...str) {
+    return [...str].join(' ');
+}
+exports.joins = joins;
+/**
+ * Function to get script extensions
+ *
+ * @param os_version
+ */
+async function scriptExtension(os_version) {
+    switch (os_version) {
+        case 'win32':
+            return '.ps1';
+        case 'linux':
+        case 'darwin':
+            return '.sh';
+        default:
+            return await log('Platform ' + os_version + ' is not supported', os_version, 'error');
+    }
+}
+exports.scriptExtension = scriptExtension;
+/**
+ * Function to get script to add tools with custom support.
+ *
+ * @param pkg
+ * @param type
+ * @param version
+ * @param os_version
+ */
+async function customPackage(pkg, type, version, os_version) {
+    const pkg_name = pkg.replace(/\d+|pdo[_-]/, '');
+    const script_extension = await scriptExtension(os_version);
+    const script = path.join(__dirname, '../src/scripts/' + type + '/' + pkg_name + script_extension);
+    const command = await getCommand(os_version, pkg_name);
+    return '\n. ' + script + '\n' + command + version;
+}
+exports.customPackage = customPackage;
 
 
 /***/ }),
@@ -1614,26 +1687,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addTools = exports.addPackage = exports.addDevTools = exports.addArchive = exports.getCleanedToolsList = exports.updateComposer = exports.addComposer = exports.getWpCliUrl = exports.getSymfonyUri = exports.getDeployerUrl = exports.getPharUrl = exports.addPhive = exports.getCodeceptionUri = exports.getCodeceptionUriBuilder = exports.getUri = exports.parseTool = exports.getToolVersion = exports.getCommand = void 0;
+exports.addTools = exports.addPackage = exports.addDevTools = exports.addArchive = exports.getCleanedToolsList = exports.getComposerUrl = exports.addComposer = exports.getWpCliUrl = exports.getSymfonyUri = exports.getDeployerUrl = exports.getPharUrl = exports.addPhive = exports.getCodeceptionUri = exports.getCodeceptionUriBuilder = exports.getUri = exports.parseTool = exports.getToolVersion = void 0;
 const utils = __importStar(__webpack_require__(163));
-/**
- * Function to get command to setup tools
- *
- * @param os_version
- * @param suffix
- */
-async function getCommand(os_version, suffix) {
-    switch (os_version) {
-        case 'linux':
-        case 'darwin':
-            return 'add_' + suffix + ' ';
-        case 'win32':
-            return 'Add-' + suffix.charAt(0).toUpperCase() + suffix.slice(1) + ' ';
-        default:
-            return await utils.log('Platform ' + os_version + ' is not supported', os_version, 'error');
-    }
-}
-exports.getCommand = getCommand;
 /**
  * Function to get tool version
  *
@@ -1645,6 +1700,8 @@ async function getToolVersion(version) {
     const composer_regex = /^stable$|^preview$|^snapshot$|^v?[1|2]$/;
     version = version.replace(/[><=^]*/, '');
     switch (true) {
+        case version.charAt(0) == 'v':
+            return version.replace('v', '');
         case composer_regex.test(version):
         case semver_regex.test(version):
             return version;
@@ -1779,10 +1836,10 @@ exports.getCodeceptionUri = getCodeceptionUri;
 async function addPhive(version, os_version) {
     switch (version) {
         case 'latest':
-            return ((await getCommand(os_version, 'tool')) +
+            return ((await utils.getCommand(os_version, 'tool')) +
                 'https://phar.io/releases/phive.phar phive');
         default:
-            return ((await getCommand(os_version, 'tool')) +
+            return ((await utils.getCommand(os_version, 'tool')) +
                 'https://github.com/phar-io/phive/releases/download/' +
                 version +
                 '/phive-' +
@@ -1887,25 +1944,26 @@ async function addComposer(tools_list) {
 }
 exports.addComposer = addComposer;
 /**
- * Function to get script to update composer
+ * Function to get composer URL for a given version
  *
  * @param version
- * @param os_version
  */
-async function updateComposer(version, os_version) {
+async function getComposerUrl(version) {
+    const cache_url = 'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-' +
+        version.replace('latest', 'stable') +
+        '.phar,';
     switch (version) {
         case 'snapshot':
+            return cache_url + 'https://getcomposer.org/composer.phar';
         case 'preview':
         case '1':
         case '2':
-            return ('\ncomposer self-update --' +
-                version +
-                (await utils.suppressOutput(os_version)));
+            return (cache_url + 'https://getcomposer.org/composer-' + version + '.phar');
         default:
-            return '';
+            return cache_url + 'https://getcomposer.org/composer-stable.phar';
     }
 }
-exports.updateComposer = updateComposer;
+exports.getComposerUrl = getComposerUrl;
 /**
  * Function to get Tools list after cleanup
  *
@@ -1918,7 +1976,7 @@ async function getCleanedToolsList(tools_csv) {
         .map(function (extension) {
         return extension
             .trim()
-            .replace(/hirak\/|laravel\/|narrowspark\/automatic-|overtrue\/|robmorgan\/|symfony\//, '');
+            .replace(/-agent|hirak\/|laravel\/|narrowspark\/automatic-|overtrue\/|robmorgan\/|symfony\//, '');
     })
         .filter(Boolean);
     return [...new Set(tools_list)];
@@ -1933,7 +1991,7 @@ exports.getCleanedToolsList = getCleanedToolsList;
  * @param os_version
  */
 async function addArchive(tool, version, url, os_version) {
-    return (await getCommand(os_version, 'tool')) + url + ' ' + tool;
+    return (await utils.getCommand(os_version, 'tool')) + url + ' ' + tool;
 }
 exports.addArchive = addArchive;
 /**
@@ -1966,7 +2024,7 @@ exports.addDevTools = addDevTools;
  * @param os_version
  */
 async function addPackage(tool, release, prefix, os_version) {
-    const tool_command = await getCommand(os_version, 'composertool');
+    const tool_command = await utils.getCommand(os_version, 'composertool');
     return tool_command + tool + ' ' + release + ' ' + prefix;
 }
 exports.addPackage = addPackage;
@@ -1990,66 +2048,45 @@ async function addTools(tools_csv, php_version, os_version) {
         let url = '';
         switch (tool) {
             case 'blackfire':
-            case 'blackfire-agent':
-                script += await getCommand(os_version, 'blackfire');
+            case 'grpc_php_plugin':
+            case 'protoc':
+                script += await utils.customPackage(tool, 'tools', version, os_version);
                 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;
-                script += await addArchive(tool, version, url, os_version);
-                break;
-            case 'phpcs':
-            case 'phpcbf':
-                url = github + 'squizlabs/PHP_CodeSniffer/' + uri;
-                script += await addArchive(tool, version, url, os_version);
-                break;
-            case 'phan':
-                url = github + 'phan/phan/' + uri;
-                script += await addArchive(tool, version, url, os_version);
-                break;
-            case 'phive':
-                script += await addPhive(version, os_version);
-                break;
-            case 'phpstan':
-                url = github + 'phpstan/phpstan/' + uri;
-                script += await addArchive(tool, version, url, os_version);
-                break;
-            case 'phpmd':
-                url = github + 'phpmd/phpmd/' + uri;
-                script += await addArchive(tool, version, url, os_version);
-                break;
-            case 'psalm':
-                url = github + 'vimeo/psalm/' + uri;
-                script += await addArchive(tool, version, url, os_version);
-                break;
-            case 'composer':
-                url = 'https://getcomposer.org/composer-stable.phar';
-                script +=
-                    (await addArchive('composer', version, url, os_version)) +
-                        (await updateComposer(version, os_version));
-                break;
             case 'codeception':
                 url =
                     'https://codeception.com/' +
                         (await getCodeceptionUri(version, php_version));
                 script += await addArchive(tool, version, url, os_version);
                 break;
-            case 'phpcpd':
-            case 'phpunit':
-                url = await getPharUrl('https://phar.phpunit.de', tool, '', version);
+            case 'composer':
+                url = await getComposerUrl(version);
+                script += await addArchive('composer', version, url, os_version);
+                break;
+            case 'composer-normalize':
+                uri = await getUri(tool, '.phar', version, 'releases', '', 'download');
+                url = github + 'ergebnis/composer-normalize/' + uri;
+                script += await addArchive(tool, version, url, os_version);
+                break;
+            case 'composer-prefetcher':
+                script += await addPackage(tool, release, 'narrowspark/automatic-', os_version);
+                break;
+            case 'composer-require-checker':
+                uri = await getUri(tool, '.phar', version, 'releases', '', 'download');
+                url = github + 'maglnet/ComposerRequireChecker/' + uri;
+                script += await addArchive(tool, version, url, os_version);
+                break;
+            case 'composer-unused':
+                uri = await getUri(tool, '.phar', version, 'releases', '', 'download');
+                url = github + 'composer-unused/composer-unused/' + uri;
+                script += await addArchive(tool, version, url, os_version);
+                break;
+            case 'cs2pr':
+                uri = await getUri(tool, '', version, 'releases', '', 'download');
+                url = github + 'staabm/annotate-pull-request-from-checkstyle/' + uri;
                 script += await addArchive(tool, version, url, os_version);
                 break;
             case 'deployer':
@@ -2059,34 +2096,69 @@ async function addTools(tools_csv, php_version, os_version) {
             case 'flex':
                 script += await addPackage(tool, release, 'symfony/', os_version);
                 break;
+            case 'infection':
+                url = github + 'infection/infection/' + uri;
+                script += await addArchive(tool, version, url, os_version);
+                break;
+            case 'pecl':
+                script += await utils.getCommand(os_version, 'pecl');
+                break;
+            case 'phan':
+                url = github + 'phan/phan/' + uri;
+                script += await addArchive(tool, version, url, os_version);
+                break;
             case 'phinx':
                 script += await addPackage(tool, release, 'robmorgan/', os_version);
                 break;
-            case 'phplint':
-                script += await addPackage(tool, release, 'overtrue/', 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, release, 'narrowspark/automatic-', os_version);
-                break;
-            case 'pecl':
-                script += await getCommand(os_version, 'pecl');
+            case 'phive':
+                script += await addPhive(version, os_version);
                 break;
             case 'php-config':
             case 'phpize':
                 script += await addDevTools(tool, os_version);
                 break;
+            case 'php-cs-fixer':
+                uri = await getUri(tool, '.phar', version, 'releases', 'v', 'download');
+                url = github + 'FriendsOfPHP/PHP-CS-Fixer/' + uri;
+                script += await addArchive(tool, version, url, os_version);
+                break;
+            case 'phpcbf':
+            case 'phpcs':
+                url = github + 'squizlabs/PHP_CodeSniffer/' + uri;
+                script += await addArchive(tool, version, url, os_version);
+                break;
+            case 'phpcpd':
+            case 'phpunit':
+                url = await getPharUrl('https://phar.phpunit.de', tool, '', version);
+                script += await addArchive(tool, version, url, os_version);
+                break;
+            case 'phplint':
+                script += await addPackage(tool, release, 'overtrue/', os_version);
+                break;
+            case 'phpmd':
+                url = github + 'phpmd/phpmd/' + uri;
+                script += await addArchive(tool, version, url, os_version);
+                break;
+            case 'phpstan':
+                url = github + 'phpstan/phpstan/' + uri;
+                script += await addArchive(tool, version, url, os_version);
+                break;
+            case 'prestissimo':
+                script += await addPackage(tool, release, 'hirak/', os_version);
+                break;
+            case 'psalm':
+                url = github + 'vimeo/psalm/' + uri;
+                script += await addArchive(tool, version, url, os_version);
+                break;
             case 'symfony':
             case 'symfony-cli':
                 uri = await getSymfonyUri(version, os_version);
                 url = github + 'symfony/cli/' + uri;
                 script += await addArchive('symfony', version, url, os_version);
                 break;
+            case 'vapor-cli':
+                script += await addPackage(tool, release, 'laravel/', os_version);
+                break;
             case 'wp-cli':
                 url = github + (await getWpCliUrl(version));
                 script += await addArchive(tool, version, url, os_version);
@@ -2157,8 +2229,7 @@ const config = __importStar(__webpack_require__(641));
 async function addCoverageXdebug(extension, version, os_version, pipe) {
     const xdebug = (await extensions.addExtension(extension, version, os_version, true)) +
         pipe;
-    const ini = (await config.addINIValues('xdebug.mode=coverage', os_version, true)) +
-        pipe;
+    const ini = await config.addINIValues('xdebug.mode=coverage', os_version, true);
     const log = await utils.addLog('$tick', extension, 'Xdebug enabled as coverage driver', os_version);
     switch (true) {
         case /^xdebug3$/.test(extension):
@@ -2413,12 +2484,12 @@ async function build(filename, version, os_version) {
     if (extension_csv) {
         script += await extensions.addExtension(extension_csv, version, os_version);
     }
-    if (ini_values_csv) {
-        script += await config.addINIValues(ini_values_csv, os_version);
-    }
     if (coverage_driver) {
         script += await coverage.addCoverage(coverage_driver, version, os_version);
     }
+    if (ini_values_csv) {
+        script += await config.addINIValues(ini_values_csv, os_version);
+    }
     return await utils.writeScript(filename, script);
 }
 exports.build = build;
@@ -2697,27 +2768,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addExtension = exports.addExtensionLinux = exports.addExtensionWindows = exports.addExtensionDarwin = exports.getXdebugVersion = void 0;
-const path = __importStar(__webpack_require__(622));
+exports.addExtension = exports.addExtensionLinux = exports.addExtensionWindows = exports.addExtensionDarwin = void 0;
 const utils = __importStar(__webpack_require__(163));
-/**
- * Function to get Xdebug version compatible with php versions
- *
- * @param version
- */
-async function getXdebugVersion(version) {
-    switch (version) {
-        case '5.3':
-            return '2.2.7';
-        case '5.4':
-            return '2.4.1';
-        case '5.5':
-            return '2.5.5';
-        default:
-            return '2.9.6';
-    }
-}
-exports.getXdebugVersion = getXdebugVersion;
 /**
  * Install and enable extensions for darwin
  *
@@ -2733,7 +2785,7 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
         const version_extension = version + extension;
         const [ext_name, ext_version] = extension.split('-');
         const ext_prefix = await utils.getExtensionPrefix(ext_name);
-        const command_prefix = 'sudo pecl install -f ';
+        const command_prefix = 'pecl_install ';
         let command = '';
         switch (true) {
             // match :extension
@@ -2742,45 +2794,32 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
                 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
+            // match pdo_oci and oci8
+            // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
+            // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
             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;
+            case /^pdo_oci$|^oci8$/.test(extension):
+            case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
+            case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+                add_script += await utils.customPackage(ext_name, 'ext', extension, 'darwin');
+                return;
             // match pre-release versions. For example - xdebug-beta
             case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-                add_script +=
-                    '\nadd_unstable_extension ' +
-                        ext_name +
-                        ' ' +
-                        ext_version +
-                        ' ' +
-                        ext_prefix;
+                add_script += await utils.joins('\nadd_unstable_extension', ext_name, ext_version, ext_prefix);
                 return;
             // match semver
             case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-                add_script +=
-                    '\nadd_pecl_extension ' +
-                        ext_name +
-                        ' ' +
-                        ext_version +
-                        ' ' +
-                        ext_prefix;
+                add_script += await utils.joins('\nadd_pecl_extension', ext_name, ext_version, ext_prefix);
+                return;
+            // match 5.3pcov to 7.0pcov
+            case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
+                add_script += await utils.getUnsupportedLog('pcov', version, 'darwin');
                 return;
-            // match 5.3xdebug...5.5xdebug
-            case /5\.[3-5]xdebug/.test(version_extension):
-                command =
-                    command_prefix + 'xdebug-' + (await getXdebugVersion(version));
-                break;
             // match 5.6xdebug to 8.0xdebug, 5.6swoole to 8.0swoole
             // match 5.6grpc to 7.4grpc, 5.6protobuf to 7.4protobuf
             // match 7.1pcov to 8.0pcov
-            case /(5\.6|7\.[0-4]|8\.[0-9])(xdebug|swoole)/.test(version_extension):
-            case /(5\.6|7\.[0-4])(grpc|protobuf)/.test(version_extension):
+            case /(5\.6|7\.[0-4]|8\.[0-9])xdebug/.test(version_extension):
+            case /(5\.6|7\.[0-4])(grpc|protobuf|swoole)/.test(version_extension):
             case /(7\.[1-4]|8\.[0-9])pcov/.test(version_extension):
                 command = 'add_brew_extension ' + ext_name;
                 break;
@@ -2790,35 +2829,18 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
                 break;
             // match imagick
             case /^imagick$/.test(extension):
-                command =
-                    'brew install pkg-config imagemagick' +
-                        pipe +
-                        ' && ' +
-                        command_prefix +
-                        'imagick' +
-                        pipe;
+                command = await utils.joins('brew install pkg-config imagemagick' + pipe, '&& ' + command_prefix + 'imagick' + pipe);
                 break;
             // match sqlite
             case /^sqlite$/.test(extension):
                 extension = 'sqlite3';
                 command = command_prefix + 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 +=
-                    '\nbash ' +
-                        path.join(__dirname, '../src/scripts/ext/phalcon_darwin.sh') +
-                        ' ' +
-                        extension +
-                        ' ' +
-                        version;
-                return;
             default:
                 command = command_prefix + extension;
                 break;
         }
-        add_script +=
-            '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
+        add_script += await utils.joins('\nadd_extension', extension, '"' + command + '"', ext_prefix);
     });
     return add_script + remove_script;
 }
@@ -2841,32 +2863,35 @@ async function addExtensionWindows(extension_csv, version) {
             // Match :extension
             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;
+                break;
+            // 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
+            // match pdo_oci and oci8
+            // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
+            // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
+            case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
+            case /^pdo_oci$|^oci8$/.test(extension):
+            case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
+            case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+                add_script += await utils.customPackage(ext_name, 'ext', extension, 'win32');
                 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;
+                add_script += await utils.joins('\nAdd-Extension', ext_name, ext_version);
                 break;
             // match semver without state
             case /.*-\d+\.\d+\.\d+$/.test(version_extension):
-                add_script += '\nAdd-Extension ' + ext_name + ' stable ' + ext_version;
-                return;
+                add_script += await utils.joins('\nAdd-Extension', ext_name, 'stable', ext_version);
+                break;
             // 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);
-                add_script +=
-                    '\nAdd-Extension ' + ext_name + ' ' + matches[2] + ' ' + matches[1];
-                return;
+                add_script += await utils.joins('\nAdd-Extension', ext_name, matches[2], matches[1]);
+                break;
+            // match 5.3pcov to 7.0pcov
+            case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
+                add_script += await utils.getUnsupportedLog('pcov', version, 'win32');
+                break;
             // match 5.3mysql..5.6mysql
             // match 5.3mysqli..5.6mysqli
             // match 5.3mysqlnd..5.6mysqlnd
@@ -2883,18 +2908,7 @@ async function addExtensionWindows(extension_csv, version) {
             // 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 +=
-                    '\n& ' +
-                        path.join(__dirname, '../src/scripts/ext/phalcon.ps1') +
-                        ' ' +
-                        extension +
-                        ' ' +
-                        version +
-                        '\n';
+                add_script += await utils.joins('\nAdd-Extension', extension);
                 break;
             default:
                 add_script += '\nAdd-Extension ' + extension;
@@ -2927,54 +2941,31 @@ async function addExtensionLinux(extension_csv, version, pipe) {
                 remove_script += '\nremove_extension ' + ext_name.slice(1);
                 return;
             // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-            // match 5.3blackfire-{semver}...5.6blackfire-{semver}, 7.0blackfire-{semver}...7.4blackfire-{semver}
+            // match 5.3blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
+            // match 5.3pdo_cubrid...7.2php_cubrid, 5.3cubrid...7.4cubrid
+            // match pdo_oci and oci8
+            // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
+            // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
+            // match 5.6gearman..7.4gearman
             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;
+            case /^((5\.[3-6])|(7\.[0-2]))pdo_cubrid$|^((5\.[3-6])|(7\.[0-4]))cubrid$/.test(version_extension):
+            case /^pdo_oci$|^oci8$/.test(extension):
+            case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
+            case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+            case /^((5\.6)|(7\.[0-4]))gearman$/.test(version_extension):
+                add_script += await utils.customPackage(ext_name, 'ext', extension, 'linux');
+                return;
             // match pre-release versions. For example - xdebug-beta
             case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-                add_script +=
-                    '\nadd_unstable_extension ' +
-                        ext_name +
-                        ' ' +
-                        ext_version +
-                        ' ' +
-                        ext_prefix;
+                add_script += await utils.joins('\nadd_unstable_extension', ext_name, ext_version, ext_prefix);
                 return;
             // match semver versions
             case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-                add_script +=
-                    '\nadd_pecl_extension ' +
-                        ext_name +
-                        ' ' +
-                        ext_version +
-                        ' ' +
-                        ext_prefix;
+                add_script += await utils.joins('\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 =
-                    '\nbash ' +
-                        path.join(__dirname, '../src/scripts/ext/gearman.sh') +
-                        ' ' +
-                        version +
-                        pipe;
-                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 +=
-                    '\nbash ' +
-                        path.join(__dirname, '../src/scripts/ext/phalcon.sh') +
-                        ' ' +
-                        extension +
-                        ' ' +
-                        version;
+            // match 5.3pcov to 7.0pcov
+            case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
+                add_script += await utils.getUnsupportedLog('pcov', version, 'linux');
                 return;
             // match 7.2xdebug3..7.4xdebug3
             case /^7\.[2-4]xdebug3$/.test(version_extension):
@@ -2986,20 +2977,9 @@ async function addExtensionLinux(extension_csv, version, pipe) {
                 extension = 'xdebug';
                 command = command_prefix + version + '-' + extension + pipe;
                 break;
-            // match 7.1xdebug..7.4xdebug
-            case /^7\.[1-4]xdebug$/.test(version_extension):
-                add_script +=
-                    '\nupdate_extension xdebug 2.9.6' +
-                        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');
+                extension = extension.replace(/pdo[_-]|3/, '');
                 add_script += '\nadd_pdo_extension ' + extension;
                 return;
             // match ast and uopz
@@ -3015,8 +2995,7 @@ async function addExtensionLinux(extension_csv, version, pipe) {
                 command = command_prefix + version + '-' + extension + pipe;
                 break;
         }
-        add_script +=
-            '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
+        add_script += await utils.joins('\nadd_extension', extension, '"' + command + '"', ext_prefix);
     });
     return add_script + remove_script;
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "2.3.2",
+  "version": "2.4.3",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "dist/index.js",
@@ -30,22 +30,22 @@
     "fs": "0.0.1-security"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.3",
-    "@types/node": "^14.0.14",
-    "@typescript-eslint/eslint-plugin": "^3.6.0",
-    "@typescript-eslint/parser": "^3.6.0",
+    "@types/jest": "^26.0.10",
+    "@types/node": "^14.6.0",
+    "@typescript-eslint/eslint-plugin": "^3.9.1",
+    "@typescript-eslint/parser": "^3.9.1",
     "@zeit/ncc": "^0.22.3",
-    "eslint": "^7.4.0",
+    "eslint": "^7.7.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-import": "^2.22.0",
-    "eslint-plugin-jest": "^23.18.0",
+    "eslint-plugin-jest": "^23.20.0",
     "eslint-plugin-prettier": "^3.1.4",
     "husky": "^4.2.5",
-    "jest": "^26.1.0",
-    "jest-circus": "^26.1.0",
+    "jest": "^26.4.0",
+    "jest-circus": "^26.4.0",
     "prettier": "^2.0.5",
-    "ts-jest": "^26.1.1",
-    "typescript": "^3.9.6"
+    "ts-jest": "^26.2.0",
+    "typescript": "^3.9.7"
   },
   "husky": {
     "skipCI": true,

src/configs/config.yaml

@@ -1,58 +0,0 @@
-variants:
-  dev:
-    bcmath:
-    calendar:
-    cli:
-    ctype:
-    dom:
-    fileinfo:
-    filter:
-    ipc:
-    iconv:
-    json:
-    mbregex:
-    mbstring:
-    mhash:
-    mcrypt:
-    pcntl:
-    pcre:
-    pdo:
-    phar:
-    posix:
-    sockets:
-    tokenizer:
-    xml:
-    curl:
-    openssl:
-    zip:
-    gd:
-      - --with-freetype
-      - --with-pdo-mysql=mysqlnd
-      - --with-mysqli=mysqlnd
-      - --with-pgsql
-      - --with-pdo-pgsql
-      - --with-gmp=/usr/local/opt/gmp
-      - --with-openssl
-      - --with-pear
-      - --with-zip
-      - --with-libxml
-      - --with-kerberos
-      - --with-gd
-      - --with-ffi
-      - --with-curl
-      - --with-mhash
-      - --with-readline=/usr/local/opt/readline
-      - --with-iconv=/usr/local/opt/libiconv
-      - --with-icu-dir=/usr/local/opt/icu4c
-      - --with-config-file-path=/etc
-      - --enable-intl
-      - --enable-xml
-      - --enable-sysvsem
-      - --enable-sysvshm
-      - --enable-sysvmsg
-      - --enable-phpdbg
-      - --enable-exif
-      - --enable-gd
-      - --enable-soap
-      - --enable-xmlreader
-      - --enable-zend-test=shared

src/coverage.ts

@@ -19,9 +19,11 @@ export async function addCoverageXdebug(
   const xdebug =
     (await extensions.addExtension(extension, version, os_version, true)) +
     pipe;
-  const ini =
-    (await config.addINIValues('xdebug.mode=coverage', os_version, true)) +
-    pipe;
+  const ini = await config.addINIValues(
+    'xdebug.mode=coverage',
+    os_version,
+    true
+  );
   const log = await utils.addLog(
     '$tick',
     extension,

src/extensions.ts

@@ -1,24 +1,5 @@
-import * as path from 'path';
 import * as utils from './utils';
 
-/**
- * Function to get Xdebug version compatible with php versions
- *
- * @param version
- */
-export async function getXdebugVersion(version: string): Promise<string> {
-  switch (version) {
-    case '5.3':
-      return '2.2.7';
-    case '5.4':
-      return '2.4.1';
-    case '5.5':
-      return '2.5.5';
-    default:
-      return '2.9.6';
-  }
-}
-
 /**
  * Install and enable extensions for darwin
  *
@@ -38,7 +19,7 @@ export async function addExtensionDarwin(
     const version_extension: string = version + extension;
     const [ext_name, ext_version]: string[] = extension.split('-');
     const ext_prefix = await utils.getExtensionPrefix(ext_name);
-    const command_prefix = 'sudo pecl install -f ';
+    const command_prefix = 'pecl_install ';
     let command = '';
     switch (true) {
       // match :extension
@@ -47,47 +28,49 @@ export async function addExtensionDarwin(
         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
+      // match pdo_oci and oci8
+      // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
+      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
       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;
+      case /^pdo_oci$|^oci8$/.test(extension):
+      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
+      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+        add_script += await utils.customPackage(
+          ext_name,
+          'ext',
+          extension,
+          'darwin'
+        );
+        return;
       // match pre-release versions. For example - xdebug-beta
       case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-        add_script +=
-          '\nadd_unstable_extension ' +
-          ext_name +
-          ' ' +
-          ext_version +
-          ' ' +
-          ext_prefix;
+        add_script += await utils.joins(
+          '\nadd_unstable_extension',
+          ext_name,
+          ext_version,
+          ext_prefix
+        );
         return;
       // match semver
       case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-        add_script +=
-          '\nadd_pecl_extension ' +
-          ext_name +
-          ' ' +
-          ext_version +
-          ' ' +
-          ext_prefix;
+        add_script += await utils.joins(
+          '\nadd_pecl_extension',
+          ext_name,
+          ext_version,
+          ext_prefix
+        );
+        return;
+      // match 5.3pcov to 7.0pcov
+      case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
+        add_script += await utils.getUnsupportedLog('pcov', version, 'darwin');
         return;
-      // match 5.3xdebug...5.5xdebug
-      case /5\.[3-5]xdebug/.test(version_extension):
-        command =
-          command_prefix + 'xdebug-' + (await getXdebugVersion(version));
-        break;
       // match 5.6xdebug to 8.0xdebug, 5.6swoole to 8.0swoole
       // match 5.6grpc to 7.4grpc, 5.6protobuf to 7.4protobuf
       // match 7.1pcov to 8.0pcov
-      case /(5\.6|7\.[0-4]|8\.[0-9])(xdebug|swoole)/.test(version_extension):
-      case /(5\.6|7\.[0-4])(grpc|protobuf)/.test(version_extension):
+      case /(5\.6|7\.[0-4]|8\.[0-9])xdebug/.test(version_extension):
+      case /(5\.6|7\.[0-4])(grpc|protobuf|swoole)/.test(version_extension):
       case /(7\.[1-4]|8\.[0-9])pcov/.test(version_extension):
         command = 'add_brew_extension ' + ext_name;
         break;
@@ -97,35 +80,26 @@ export async function addExtensionDarwin(
         break;
       // match imagick
       case /^imagick$/.test(extension):
-        command =
-          'brew install pkg-config imagemagick' +
-          pipe +
-          ' && ' +
-          command_prefix +
-          'imagick' +
-          pipe;
+        command = await utils.joins(
+          'brew install pkg-config imagemagick' + pipe,
+          '&& ' + command_prefix + 'imagick' + pipe
+        );
         break;
       // match sqlite
       case /^sqlite$/.test(extension):
         extension = 'sqlite3';
         command = command_prefix + 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 +=
-          '\nbash ' +
-          path.join(__dirname, '../src/scripts/ext/phalcon_darwin.sh') +
-          ' ' +
-          extension +
-          ' ' +
-          version;
-        return;
       default:
         command = command_prefix + extension;
         break;
     }
-    add_script +=
-      '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
+    add_script += await utils.joins(
+      '\nadd_extension',
+      extension,
+      '"' + command + '"',
+      ext_prefix
+    );
   });
   return add_script + remove_script;
 }
@@ -151,28 +125,42 @@ export async function addExtensionWindows(
       // Match :extension
       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(
+        break;
+      // 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
+      // match pdo_oci and oci8
+      // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
+      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
+      case /^(5\.[3-6]|7\.[0-4])blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
-        add_script +=
-          '\n& ' +
-          path.join(__dirname, '../src/scripts/ext/blackfire.ps1') +
-          ' ' +
-          version +
-          ' ' +
-          extension;
+      case /^pdo_oci$|^oci8$/.test(extension):
+      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
+      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+        add_script += await utils.customPackage(
+          ext_name,
+          'ext',
+          extension,
+          'win32'
+        );
         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;
+        add_script += await utils.joins(
+          '\nAdd-Extension',
+          ext_name,
+          ext_version
+        );
         break;
       // match semver without state
       case /.*-\d+\.\d+\.\d+$/.test(version_extension):
-        add_script += '\nAdd-Extension ' + ext_name + ' stable ' + ext_version;
-        return;
+        add_script += await utils.joins(
+          '\nAdd-Extension',
+          ext_name,
+          'stable',
+          ext_version
+        );
+        break;
       // match semver with state
       case /.*-(\d+\.\d+\.\d)(beta|alpha|devel|snapshot)\d*/.test(
         version_extension
@@ -180,9 +168,17 @@ export async function addExtensionWindows(
         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;
+        add_script += await utils.joins(
+          '\nAdd-Extension',
+          ext_name,
+          matches[2],
+          matches[1]
+        );
+        break;
+      // match 5.3pcov to 7.0pcov
+      case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
+        add_script += await utils.getUnsupportedLog('pcov', version, 'win32');
+        break;
       // match 5.3mysql..5.6mysql
       // match 5.3mysqli..5.6mysqli
       // match 5.3mysqlnd..5.6mysqlnd
@@ -199,18 +195,7 @@ export async function addExtensionWindows(
       // 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 +=
-          '\n& ' +
-          path.join(__dirname, '../src/scripts/ext/phalcon.ps1') +
-          ' ' +
-          extension +
-          ' ' +
-          version +
-          '\n';
+        add_script += await utils.joins('\nAdd-Extension', extension);
         break;
       default:
         add_script += '\nAdd-Extension ' + extension;
@@ -247,56 +232,50 @@ export async function addExtensionLinux(
         remove_script += '\nremove_extension ' + ext_name.slice(1);
         return;
       // match 5.3blackfire...5.6blackfire, 7.0blackfire...7.4blackfire
-      // match 5.3blackfire-{semver}...5.6blackfire-{semver}, 7.0blackfire-{semver}...7.4blackfire-{semver}
+      // match 5.3blackfire-1.31.0...5.6blackfire-1.31.0, 7.0blackfire-1.31.0...7.4blackfire-1.31.0
+      // match 5.3pdo_cubrid...7.2php_cubrid, 5.3cubrid...7.4cubrid
+      // match pdo_oci and oci8
+      // match 5.3ioncube...7.4ioncube, 7.0ioncube...7.4ioncube
+      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
+      // match 5.6gearman..7.4gearman
       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;
+      case /^((5\.[3-6])|(7\.[0-2]))pdo_cubrid$|^((5\.[3-6])|(7\.[0-4]))cubrid$/.test(
+        version_extension
+      ):
+      case /^pdo_oci$|^oci8$/.test(extension):
+      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
+      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
+      case /^((5\.6)|(7\.[0-4]))gearman$/.test(version_extension):
+        add_script += await utils.customPackage(
+          ext_name,
+          'ext',
+          extension,
+          'linux'
+        );
+        return;
       // match pre-release versions. For example - xdebug-beta
       case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
-        add_script +=
-          '\nadd_unstable_extension ' +
-          ext_name +
-          ' ' +
-          ext_version +
-          ' ' +
-          ext_prefix;
+        add_script += await utils.joins(
+          '\nadd_unstable_extension',
+          ext_name,
+          ext_version,
+          ext_prefix
+        );
         return;
       // match semver versions
       case /.*-\d+\.\d+\.\d+.*/.test(version_extension):
-        add_script +=
-          '\nadd_pecl_extension ' +
-          ext_name +
-          ' ' +
-          ext_version +
-          ' ' +
-          ext_prefix;
+        add_script += await utils.joins(
+          '\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 =
-          '\nbash ' +
-          path.join(__dirname, '../src/scripts/ext/gearman.sh') +
-          ' ' +
-          version +
-          pipe;
-        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 +=
-          '\nbash ' +
-          path.join(__dirname, '../src/scripts/ext/phalcon.sh') +
-          ' ' +
-          extension +
-          ' ' +
-          version;
+      // match 5.3pcov to 7.0pcov
+      case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
+        add_script += await utils.getUnsupportedLog('pcov', version, 'linux');
         return;
       // match 7.2xdebug3..7.4xdebug3
       case /^7\.[2-4]xdebug3$/.test(version_extension):
@@ -308,20 +287,9 @@ export async function addExtensionLinux(
         extension = 'xdebug';
         command = command_prefix + version + '-' + extension + pipe;
         break;
-      // match 7.1xdebug..7.4xdebug
-      case /^7\.[1-4]xdebug$/.test(version_extension):
-        add_script +=
-          '\nupdate_extension xdebug 2.9.6' +
-          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');
+        extension = extension.replace(/pdo[_-]|3/, '');
         add_script += '\nadd_pdo_extension ' + extension;
         return;
       // match ast and uopz
@@ -337,8 +305,12 @@ export async function addExtensionLinux(
         command = command_prefix + version + '-' + extension + pipe;
         break;
     }
-    add_script +=
-      '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
+    add_script += await utils.joins(
+      '\nadd_extension',
+      extension,
+      '"' + command + '"',
+      ext_prefix
+    );
   });
   return add_script + remove_script;
 }

src/install.ts

@@ -41,12 +41,12 @@ export async function build(
   if (extension_csv) {
     script += await extensions.addExtension(extension_csv, version, os_version);
   }
-  if (ini_values_csv) {
-    script += await config.addINIValues(ini_values_csv, os_version);
-  }
   if (coverage_driver) {
     script += await coverage.addCoverage(coverage_driver, version, os_version);
   }
+  if (ini_values_csv) {
+    script += await config.addINIValues(ini_values_csv, os_version);
+  }
 
   return await utils.writeScript(filename, script);
 }

src/scripts/darwin.sh

@@ -16,6 +16,16 @@ add_log() {
   fi
 }
 
+# Function to log result of installing extension.
+add_extension_log() {
+  extension=$1
+  status=$2
+  extension_name=$(echo "$extension" | cut -d '-' -f 1)
+  (
+    check_extension "$extension_name" && add_log "$tick" "$extension_name" "$status"
+  ) || add_log "$cross" "$extension_name" "Could not install $extension on PHP $semver"
+}
+
 # Function to read env inputs.
 read_env() {
   [[ -z "${update}" ]] && update='false' && UPDATE='false' || update="${update}"
@@ -27,9 +37,9 @@ read_env() {
 # Function to setup environment for self-hosted runners.
 self_hosted_setup() {
   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"
+    step_log "Setup Brew"
+    curl "${curl_opts[@]}" https://raw.githubusercontent.com/Homebrew/install/master/install.sh | bash -s >/dev/null 2>&1
+    add_log "$tick" "Brew" "Installed Homebrew"
   fi
 }
 
@@ -41,7 +51,7 @@ remove_extension() {
     sudo rm -rf "$scan_dir"/*"$extension"* >/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"
+      add_log "$cross" ":$extension" "Could not remove $extension on PHP $semver"
   else
     add_log "$tick" ":$extension" "Could not find $extension on PHP $semver"
   fi
@@ -60,21 +70,30 @@ check_extension() {
 # Fuction to get the PECL version.
 get_pecl_version() {
   extension=$1
-  stability=$2
+  stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot)")"
   pecl_rest='https://pecl.php.net/rest/r/'
-  response=$(curl -q -sSL "$pecl_rest$extension"/allreleases.xml)
-  pecl_version=$(echo "$response" | grep -m 1 -Eo "(\d*\.\d*\.\d*$stability\d*)")
+  response=$(curl "${curl_opts[@]}" "$pecl_rest$extension"/allreleases.xml)
+  pecl_version=$(echo "$response" | grep -m 1 -Eio "(\d*\.\d*\.\d*$stability\d*)")
   if [ ! "$pecl_version" ]; then
     pecl_version=$(echo "$response" | grep -m 1 -Eo "(\d*\.\d*\.\d*)")
   fi
   echo "$pecl_version"
 }
 
+# Function to install PECL extensions and accept default options
+pecl_install() {
+  local extension=$1
+  yes '' | sudo pecl install -f "$extension" >/dev/null 2>&1
+}
+
 # Function to install a specific version of PECL extension.
 add_pecl_extension() {
   extension=$1
   pecl_version=$2
   prefix=$3
+  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot).* ]]; then
+    pecl_version=$(get_pecl_version "$extension" "$pecl_version")
+  fi
   if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
     echo "$prefix=$ext_dir/$extension.so" >>"$ini_file"
   fi
@@ -83,11 +102,8 @@ add_pecl_extension() {
     add_log "$tick" "$extension" "Enabled"
   else
     remove_extension "$extension" >/dev/null 2>&1
-    (
-      sudo pecl install -f "$extension-$pecl_version" >/dev/null 2>&1 &&
-      check_extension "$extension" &&
-      add_log "$tick" "$extension" "Installed and enabled"
-    ) || add_log "$cross" "$extension" "Could not install $extension-$pecl_version on PHP $semver"
+    pecl_install "$extension-$pecl_version"
+    add_extension_log "$extension-$pecl_version" "Installed and enabled"
   fi
 }
 
@@ -112,9 +128,8 @@ add_extension() {
     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
-    (check_extension "$extension" && add_log "$tick" "$extension" "Installed and enabled") ||
-    add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
+      if [[ "$version" =~ $old_versions ]]; then echo "$prefix=$ext_dir/$extension.so" >>"$ini_file"; fi
+    add_extension_log "$extension" "Installed and enabled"
   fi
 }
 
@@ -127,6 +142,22 @@ add_unstable_extension() {
   add_pecl_extension "$extension" "$pecl_version" "$prefix"
 }
 
+# Function to configure composer
+configure_composer() {
+  tool_path=$1
+  sudo ln -sf "$tool_path" "$tool_path.phar"
+  php -r "try {\$p=new Phar('$tool_path.phar', 0);exit(0);} catch(Exception \$e) {exit(1);}"
+  if [ $? -eq 1 ]; then
+    add_log "$cross" "composer" "Could not download composer"
+    exit 1
+  fi
+  composer -q global config process-timeout 0
+  echo "::add-path::/Users/$USER/.composer/vendor/bin"
+  if [ -n "$COMPOSER_TOKEN" ]; then
+    composer -q global config github-oauth.github.com "$COMPOSER_TOKEN"
+  fi
+}
+
 # Function to setup a remote tool.
 add_tool() {
   url=$1
@@ -135,27 +166,24 @@ add_tool() {
   if [ ! -e "$tool_path" ]; then
     rm -rf "$tool_path"
   fi
-
-  status_code=$(sudo curl -s -w "%{http_code}" -o "$tool_path" -L "$url")
+  if [ "$tool" = "composer" ]; then
+    IFS="," read -r -a urls <<< "$url"
+    status_code=$(sudo curl -f -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "${urls[0]}") ||
+    status_code=$(sudo curl -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "${urls[1]}")
+  else
+    status_code=$(sudo curl -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "$url")
+  fi
   if [ "$status_code" = "200" ]; then
     sudo chmod a+x "$tool_path"
     if [ "$tool" = "composer" ]; then
-      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
-      # TODO: Remove after composer 2.0 update, fixes peer fingerprint error
-      if [[ "$version" =~ $old_versions ]]; then
-        composer -q global config repos.packagist composer https://repo-ca-bhs-1.packagist.org
-      fi
+      configure_composer "$tool_path"
     elif [ "$tool" = "phan" ]; then
-      add_extension fileinfo "sudo pecl install -f fileinfo" extension >/dev/null 2>&1
-      add_extension ast "sudo pecl install -f ast" extension >/dev/null 2>&1
+      add_extension fileinfo "pecl_install fileinfo" extension >/dev/null 2>&1
+      add_extension ast "pecl_install ast" extension >/dev/null 2>&1
     elif [ "$tool" = "phive" ]; then
-      add_extension curl "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
+      add_extension curl "pecl_install curl" extension >/dev/null 2>&1
+      add_extension mbstring "pecl_install mbstring" extension >/dev/null 2>&1
+      add_extension xml "pecl_install xml" extension >/dev/null 2>&1
     elif [ "$tool" = "cs2pr" ]; then
       sudo sed -i '' 's/exit(9)/exit(0)/' "$tool_path"
       tr -d '\r' <"$tool_path" | sudo tee "$tool_path.tmp" >/dev/null 2>&1 && sudo mv "$tool_path.tmp" "$tool_path"
@@ -175,26 +203,10 @@ add_composertool() {
   release=$2
   prefix=$3
   (
-    composer global require "$prefix$release" >/dev/null 2>&1 &&
-    add_log "$tick" "$tool" "Added"
+    composer global require "$prefix$release" >/dev/null 2>&1 && add_log "$tick" "$tool" "Added"
   ) || add_log "$cross" "$tool" "Could not setup $tool"
 }
 
-add_blackfire() {
-  sudo mkdir -p usr/local/var/run
-  brew tap --shallow blackfireio/homebrew-blackfire >/dev/null 2>&1
-  brew install blackfire-agent >/dev/null 2>&1
-  if [[ -n $BLACKFIRE_SERVER_ID ]] && [[ -n $BLACKFIRE_SERVER_TOKEN ]]; then
-    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
-  fi
-  if [[ -n $BLACKFIRE_CLIENT_ID ]] && [[ -n $BLACKFIRE_CLIENT_TOKEN ]]; then
-    sudo blackfire config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1
-  fi
-  add_log "$tick" "blackfire" "Added"
-  add_log "$tick" "blackfire-agent" "Added"
-}
-
 # Function to configure PECL
 configure_pecl() {
   for tool in pear pecl; do
@@ -228,6 +240,7 @@ version=$1
 nodot_version=${1/./}
 old_versions="5.[3-5]"
 tool_path_dir="/usr/local/bin"
+curl_opts=(-sL)
 existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
 
 read_env
@@ -243,7 +256,7 @@ fi
 # Setup PHP
 step_log "Setup PHP"
 if [[ "$version" =~ $old_versions ]]; then
-  curl -sSL https://github.com/shivammathur/php5-darwin/releases/latest/download/install.sh | bash -s "$nodot_version" >/dev/null 2>&1 &&
+  curl "${curl_opts[@]}" https://github.com/shivammathur/php5-darwin/releases/latest/download/install.sh | bash -s "$nodot_version" >/dev/null 2>&1
   status="Installed"
 elif [ "$existing_version" != "$version" ]; then
   setup_php "install" >/dev/null 2>&1
@@ -256,7 +269,7 @@ else
 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"
+echo -e "date.timezone=UTC\nmemory_limit=-1" >>"$ini_file"
 ext_dir=$(php -i | grep -Ei "extension_dir => /" | sed -e "s|.*=> s*||")
 scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
 sudo mkdir -p "$ext_dir"

src/scripts/ext/blackfire.ps1

@@ -1,35 +1,28 @@
-Param (
+# Function to install blackfire extension.
+Function Add-Blackfire() {
+  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 }
+  )
+  try {
+    $no_dot_version = $version.replace('.', '')
+    $extension_version = $extension.split('-')[1]
+    if ($extension_version -notmatch "\S") {
+        $extension_version = (Invoke-RestMethod https://blackfire.io/api/v1/releases).probe.php
+    }
+    if (Test-Path $ext_dir\blackfire.dll) {
+        Enable-PhpExtension -Extension blackfire -Path $php_dir
+        $status="Enabled"
+    } else {
+        $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
+        Invoke-WebRequest -UseBasicParsing -Uri "https://packages.blackfire.io/binaries/blackfire-php/${extension_version}/blackfire-php-windows_${arch}-php-${no_dot_version}${nts}.dll" -OutFile $ext_dir\blackfire.dll > $null 2>&1
+        Enable-PhpExtension -Extension blackfire -Path $php_dir
+        $status="Installed and enabled"
+    }
+    Add-Log $tick $extension $status
+  } catch {
+    Add-Log $cross $extension "Could not install $extension on PHP $($installed.FullVersion)"
+  }
 }
-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 +1,17 @@
-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"
+# Function to install blackfire extension.
+add_blackfire() {
+  extension=$1
+  version=${version:?}
+  no_dot_version=${version/./}
+  platform=$(uname -s | tr '[:upper:]' '[:lower:]')
+  extension_version=$(echo "$extension" | cut -d '-' -f 2)
+  blackfire_ini_file="${scan_dir:?}/50-blackfire.ini"
+  if [ ! -e "${ext_dir:?}/blackfire.so" ]; then
+    if [ "$extension_version" = "blackfire" ]; then
+      extension_version=$(curl -sSL https://blackfire.io/api/v1/releases | grep -Eo 'php":"([0-9]+.[0-9]+.[0-9]+)' | cut -d '"' -f 3)
+    fi
+    sudo curl -o "${ext_dir:?}/blackfire.so" "${curl_opts[@]:?}" https://packages.blackfire.io/binaries/blackfire-php/"$extension_version"/blackfire-php-"$platform"_amd64-php-"$no_dot_version".so >/dev/null 2>&1
+  fi
+  echo "extension=blackfire.so" | sudo tee -a "$blackfire_ini_file" >/dev/null 2>&1
+  add_extension_log "$extension-$extension_version" "Installed and enabled"
+}

src/scripts/ext/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/cubrid.sh

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

src/scripts/ext/gearman.sh

@@ -1,9 +1,23 @@
-release_version=$(lsb_release -s -r)
-sudo DEBIAN_FRONTEND=noninteractive add-apt-repository ppa:ondrej/pkg-gearman -y
-sudo DEBIAN_FRONTEND=noninteractive apt-get update -y
+# Helper function to add gearman extension.
+add_gearman_helper() {
+  sudo "${debconf_fix:?}" add-apt-repository ppa:ondrej/pkg-gearman -y
+  if [ -e "${ext_dir:?}/gearman.so" ] && [ "$DISTRIB_RELEASE" != "16.04" ]; then
+    ${apt_install:?} libgearman-dev
+    echo "extension=gearman.so" | sudo tee -a "${scan_dir:?}/20-gearman.ini" >/dev/null 2>&1
+  else
+    status="Installed and enabled"
+    if [ "$DISTRIB_RELEASE" = "16.04" ]; then
+      sudo "${debconf_fix:?}" apt-get update -y
+      ${apt_install:?} php"${version:?}"-gearman
+    else
+      ${apt_install:?} libgearman-dev php"${version:?}"-gearman
+    fi
+  fi
+}
 
-if [ "$release_version" = "18.04" ]; then
-  sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y libgearman-dev php"$1"-gearman
-elif [ "$release_version" = "16.04" ]; then
-  sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php"$1"-gearman
-fi
+# Function to add gearman extension.
+add_gearman() {
+  status="Enabled"
+  add_gearman_helper >/dev/null 2>&1
+  add_extension_log "gearman" "$status"
+}

src/scripts/ext/ioncube.ps1

@@ -0,0 +1,32 @@
+# Function to log result of a operation.
+Function Add-LicenseLog() {
+  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "ioncube" "Click to read the ioncube loader license information"
+  Get-Content $ext_dir\ioncube\LICENSE.txt
+  Write-Output "::endgroup::"
+}
+
+# Function to add ioncube extension.
+Function Add-Ioncube() {
+  try {
+    if (-not(Test-Path $ext_dir\php_ioncube.dll)) {
+      $status = 'Installed and enabled'
+      $arch_part = $arch
+      if ($arch -eq 'x64') {
+        $arch_part = 'x86-64'
+      }
+      $vc = $installed.VCVersion
+      $ts_part = ""
+      if (-not($installed.ThreadSafe)) {
+        $ts_part = "_nonts"
+      }
+      Invoke-WebRequest -UseBasicParsing -Uri "https://downloads.ioncube.com/loader_downloads/ioncube_loaders_win$ts_part`_vc$vc`_$arch_part.zip" -OutFile $ext_dir\ioncube.zip
+      Expand-Archive -Path $ext_dir\ioncube.zip -DestinationPath $ext_dir -Force
+      Copy-Item $ext_dir\ioncube\ioncube_loader_win_$version.dll $ext_dir\php_ioncube.dll
+    }
+    "zend_extension=$ext_dir\php_ioncube.dll`r`n" + (Get-Content $php_dir\php.ini -Raw) | Set-Content $php_dir\php.ini
+    Add-Log $tick "ioncube" $status
+    Add-LicenseLog
+  } catch {
+    Add-Log $cross "ioncube" "Could not install ioncube on PHP $($installed.FullVersion)"
+  }
+}

src/scripts/ext/ioncube.sh

@@ -0,0 +1,19 @@
+# Function to log result of a operation.
+add_license_log() {
+  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "ioncube" "Click to read the ioncube loader license information"
+  cat /tmp/ioncube/LICENSE.txt
+  echo "::endgroup::"
+}
+
+# Function to install ioncube.
+add_ioncube() {
+  if [ ! -e "${ext_dir:?}/ioncube.so" ]; then
+    status='Installed and enabled'
+    os_name='lin' && [ "$(uname -s)" = "Darwin" ] && os_name='mac'
+    curl "${curl_opts[@]:?}" https://downloads.ioncube.com/loader_downloads/ioncube_loaders_"$os_name"_x86-64.tar.gz | tar -xzf - -C /tmp
+    sudo mv /tmp/ioncube/ioncube_loader_"$os_name"_"${version:?}".so "$ext_dir/ioncube.so"
+  fi
+  echo "zend_extension=$ext_dir/ioncube.so" | sudo tee "${scan_dir:?}/00-ioncube.ini" >/dev/null 2>&1
+  add_extension_log "ioncube" "$status"
+  check_extension "ioncube" && add_license_log
+}

src/scripts/ext/oci.ps1

@@ -0,0 +1,58 @@
+# Function to log license information.
+Function Add-LicenseLog() {
+    printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" $extension "Click to read the $extension related license information"
+    printf "Oracle Instant Client package is required for %s extension.\n" $extension
+    printf "It is provided under the Oracle Technology Network Development and Distribution License.\n"
+    printf "Refer to: \033[35;1m%s \033[0m\n" "https://www.oracle.com/downloads/licenses/instant-client-lic.html"
+    Write-Output "::endgroup::"
+}
+
+# Function to get instantclinet.
+Function Add-InstantClient() {
+  if (-not(Test-Path $php_dir\oci.dll)) {
+    $suffix = 'windows'
+    if ($arch -eq 'x86') {
+      $suffix = 'nt'
+    }
+    Invoke-WebRequest -UseBasicParsing -Uri https://download.oracle.com/otn_software/nt/instantclient/instantclient-basiclite-$suffix.zip -OutFile $php_dir\instantclient.zip
+    Expand-Archive -Path $php_dir\instantclient.zip -DestinationPath $php_dir -Force
+    Copy-Item $php_dir\instantclient*\* $php_dir
+  }
+}
+
+# Function to install oci8 and pdo_oci.
+Function Add-Oci() {
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateSet('oci8', 'pdo_oci')]
+    [string]
+    $extension
+  )
+  try {
+    $status = 'Enabled'
+    Add-InstantClient
+    if ($extension -eq "pdo_oci") {
+      Enable-PhpExtension pdo_oci -Path $php_dir
+    } else {
+      if(-not(Test-Path $ext_dir\php_oci8.dll)) {
+        $status = 'Installed and enabled'
+        $ociVersion = '2.2.0'
+        if ($version -eq '7.0') {
+          $ociVersion = '2.1.8'
+        } elseif ($version -lt '7.0') {
+          $ociVersion = '2.0.12'
+        }
+        $ociUrl = Get-PeclArchiveUrl oci8 $ociVersion $installed
+        Invoke-WebRequest -UseBasicParsing -Uri $ociUrl -OutFile $php_dir\oci8.zip
+        Expand-Archive -Path $php_dir\oci8.zip -DestinationPath $ext_dir -Force
+
+      }
+      Add-Content -Value "`r`nextension=php_oci8.dll" -Path $php_dir\php.ini
+    }
+    Add-Log $tick $extension $status
+    Add-LicenseLog
+  } catch {
+    Add-Log $cross $extension "Could not install $extension on PHP $( $installed.FullVersion )"
+  }
+}

src/scripts/ext/oci.sh

@@ -0,0 +1,125 @@
+# Function to log result of a operation.
+add_license_log() {
+  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "$ext" "Click to read the $ext related license information"
+  printf "Oracle Instant Client package is required for %s extension.\n" "$ext"
+  printf "It is provided under the Oracle Technology Network Development and Distribution License.\n"
+  printf "Refer to: \033[35;1m%s \033[0m\n" "https://www.oracle.com/downloads/licenses/instant-client-lic.html"
+  echo "::endgroup::"
+}
+
+# Function to get the tag for a php version.
+get_tag() {
+  master_version='8.0'
+  tag='master'
+  if [ ! "${version:?}" = "$master_version" ]; then
+    tag="php-$(php -v | head -n 1 | cut -f 2 -d ' ' | cut -f 1 -d '-')"
+  fi
+  echo "$tag"
+}
+
+# Function to install instantclient and SDK.
+add_client() {
+  sudo mkdir -p -m 777 "$oracle_home"
+  if [ ! -e "$oracle_client" ]; then
+    for package in basiclite sdk; do
+      if [ "$os" = 'Linux' ]; then
+        libs='/usr/lib/'
+        os_name='linux'
+        arch='linuxx64'
+        lib_ext='so'
+      elif [ "$os" = 'Darwin' ]; then
+        libs='/usr/local/lib/'
+        os_name='mac'
+        arch='macos'
+        lib_ext='dylib'
+      fi
+      curl -o "/opt/oracle/$package.zip" "${curl_opts[@]:?}" "https://download.oracle.com/otn_software/$os_name/instantclient/instantclient-$package-$arch.zip"
+      unzip "/opt/oracle/$package.zip" -d "$oracle_home"
+    done
+    sudo ln -sf /opt/oracle/instantclient*/*.$lib_ext* $libs
+    sudo ln -sf /opt/oracle/instantclient* "$oracle_client"
+  fi
+}
+
+# Function to get PHP source.
+get_php() {
+  [ ! -d "/opt/oracle/php-src-$tag" ] && curl "${curl_opts[@]}" "https://github.com/php/php-src/archive/$tag.tar.gz" | tar xzf - -C "$oracle_home/"
+}
+
+# Function to get phpize location on darwin.
+get_phpize() {
+  if [[ "$version" =~ 5.[3-5] ]]; then
+    echo '/opt/local/bin/phpize'
+  else
+    echo "/usr/local/bin/$(readlink /usr/local/bin/phpize)"
+  fi
+}
+
+# Function to patch phpize to link to php headers on darwin.
+patch_phpize() {
+  if [ "$os" = "Darwin" ]; then
+    sudo cp "$phpize_orig" "$phpize_orig.bck"
+    sudo sed -i '' 's~includedir=.*~includedir="$(xcrun --show-sdk-path)/usr/include/php"~g' "$phpize_orig"
+  fi
+}
+
+# Function to restore phpize.
+restore_phpize() {
+  if [ "$os" = "Darwin" ]; then
+    sudo mv "$phpize_orig.bck" "$phpize_orig" || true
+  fi
+}
+
+# Function to patch pdo_oci.
+patch_pdo_oci_config() {
+  curl -O "${curl_opts[@]}" https://raw.githubusercontent.com/php/php-src/master/ext/pdo_oci/config.m4
+  sudo sed -i '' "/PHP_CHECK_PDO_INCLUDES/d" config.m4 || sudo sed -i "/PHP_CHECK_PDO_INCLUDES/d" config.m4
+}
+
+# Function to install the dependencies.
+add_dependencies() {
+  if [ "$os" = 'Linux' ]; then
+    if [ "${runner:?}" = "self-hosted" ]; then
+      ${apt_install:?} autoconf automake libaio-dev gcc g++ php"$version"-dev
+    else
+      update_lists
+      ${apt_install:?} php"$version"-dev
+    fi
+    sudo update-alternatives --set php-config /usr/bin/php-config"$version"
+    sudo update-alternatives --set phpize /usr/bin/phpize"$version"
+  fi
+}
+
+# Function to install oci8 and pdo_oci.
+add_oci_helper() {
+  if ! [ -e "${ext_dir:?}/$ext.so" ]; then
+    status='Installed and enabled'
+    phpize_orig=$(get_phpize)
+    tag=$(get_tag)
+    get_php
+    patch_phpize
+    (
+      cd "/opt/oracle/php-src-$tag/ext/$ext" || exit 1
+      [ "$ext" = "pdo_oci" ] && patch_pdo_oci_config
+      sudo phpize && ./configure --with-php-config="$(command -v php-config)" --with-"${ext/_/-}"=instantclient,"$oracle_client"
+      sudo make -j"$(nproc)"
+      sudo cp ./modules/* "$ext_dir/"
+    )
+    restore_phpize
+  fi
+  echo "extension=$ext.so" | sudo tee "${scan_dir:?}/99-$ext.ini"
+}
+
+# Function to add oci extension oci8 and pdo_oci.
+add_oci() {
+  ext=$1
+  status='Enabled'
+  oracle_home='/opt/oracle'
+  oracle_client=$oracle_home/instantclient
+  os=$(uname -s)
+  add_client >/dev/null 2>&1
+  add_dependencies >/dev/null 2>&1
+  add_oci_helper >/dev/null 2>&1
+  add_extension_log "$ext" "$status"
+  check_extension "$ext" && add_license_log
+}

src/scripts/ext/pcov.sh

@@ -1,5 +0,0 @@
-cd ~ && git clone --depth=1 https://github.com/krakjoe/pcov.git
-cd pcov && phpize
-./configure --enable-pcov
-make
-sudo make install

src/scripts/ext/phalcon.ps1

@@ -1,57 +1,55 @@
-Param (
+# Function to install phalcon
+Function Add-PhalconHelper() {
+  if ($extension_version -eq '4') {
+    Install-Phpextension phalcon -MinimumStability stable -Path $php_dir
+  } else {
+    $domain = 'https://github.com'
+    $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
+    $match = Invoke-WebRequest -UseBasicParsing -Uri $domain/phalcon/cphalcon/releases | Select-String -Pattern "href=`"(.*phalcon_x64_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)`""
+    $zip_file = $match.Matches[0].Groups[1].Value
+    Invoke-WebRequest -UseBasicParsing -Uri $domain/$zip_file -OutFile $ENV:RUNNER_TOOL_CACHE\phalcon.zip > $null 2>&1
+    Expand-Archive -Path $ENV:RUNNER_TOOL_CACHE\phalcon.zip -DestinationPath $ENV:RUNNER_TOOL_CACHE\phalcon -Force > $null 2>&1
+    Copy-Item -Path "$ENV:RUNNER_TOOL_CACHE\phalcon\php_phalcon.dll" -Destination "$ext_dir\php_phalcon.dll"
+    Enable-PhpExtension -Extension phalcon -Path $php_dir
+  }
+}
+
+Function Add-Phalcon() {
+  Param (
     [Parameter(Position = 0, Mandatory = $true)]
     [ValidateNotNull()]
     [ValidateSet('phalcon3', 'phalcon4')]
     [string]
-    $extension,
-    [Parameter(Position = 1, Mandatory = $true)]
-    [ValidateNotNull()]
-    [ValidateLength(1, [int]::MaxValue)]
-    [string]
-    $version
-)
+    $extension
+  )
+  try {
+    $status = 'Enabled'
+    $extension_version = $extension.substring($extension.Length - 1)
 
-# Function to install phalcon
-Function Install-Phalcon() {
-    if ($extension_version -eq '4') {
-        Install-Phpextension phalcon -MinimumStability stable -Path $php_dir
-    } else {
-        $installed = Get-Php -Path $php_dir
-        $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
-        $match = Invoke-WebRequest -UseBasicParsing -Uri $domain/phalcon/cphalcon/releases | Select-String -Pattern "href=`"(.*phalcon_x64_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)`""
-        $zip_file = $match.Matches[0].Groups[1].Value
-        Invoke-WebRequest -UseBasicParsing -Uri $domain/$zip_file -OutFile $ENV:RUNNER_TOOL_CACHE\phalcon.zip > $null 2>&1
-        Expand-Archive -Path $ENV:RUNNER_TOOL_CACHE\phalcon.zip -DestinationPath $ENV:RUNNER_TOOL_CACHE\phalcon -Force > $null 2>&1
-        Copy-Item -Path "$ENV:RUNNER_TOOL_CACHE\phalcon\php_phalcon.dll" -Destination "$ext_dir\php_phalcon.dll"
-        Enable-PhpExtension -Extension phalcon -Path $php_dir
-    }
-    printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "32" $tick $extension "Installed and enabled"
-}
-
-$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"
-$extension_version = $extension.substring($extension.Length - 1)
-
-if($extension_version -eq '4') {
-    if (Test-Path $ext_dir\php_psr.dll) {
+    if($extension_version -eq '4') {
+      if (Test-Path $ext_dir\php_psr.dll) {
         Enable-PhpExtension -Extension psr -Path $php_dir
-    } else {
+      } else {
         Install-Phpextension psr -MinimumStability stable -Path $php_dir
+      }
     }
-}
 
-if(Test-Path $ext_dir\php_phalcon.dll) {
-    $phalcon = Get-PhpExtension $ext_dir\php_phalcon.dll
-    if($phalcon.Version[0] -eq $extension_version) {
+    if(Test-Path $ext_dir\php_phalcon.dll) {
+      $phalcon = Get-PhpExtension $ext_dir\php_phalcon.dll
+      if($phalcon.Version[0] -eq $extension_version) {
         Enable-PhpExtension -Extension phalcon -Path $php_dir
-        printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "32" $tick $extension "Enabled"
-    } else {
+      } else {
+        $status = 'Installed and enabled'
         Remove-Item $ext_dir\php_phalcon.dll
-        Install-Phalcon
+        Add-PhalconHelper
+      }
+    } else {
+      $status = 'Installed and enabled'
+      Add-PhalconHelper
     }
-} else {
-    Install-Phalcon
-}
+    Add-Log $tick $extension $status
+  } catch [Exception] {
+    Write-Output $_.Exception|format-list -force
+    Add-Log $cross $extension "Could not install $extension on PHP $($installed.FullVersion)"
+  }
+}

src/scripts/ext/phalcon.sh

@@ -1,71 +1,65 @@
-# Function to log result of a operation
-add_log() {
-  mark=$1
-  subject=$2
-  message=$3
-  if [ "$mark" = "$tick" ]; then
-    printf "\033[32;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
+# Helper function to add phalcon.
+add_phalcon_helper() {
+  status='Installed and enabled'
+  if [ "$os_name" = "Linux" ]; then
+    update_lists
+    ${apt_install:?} "php${version:?}-$extension"
   else
-    printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
+    phalcon_ini_file=${ini_file:?}
+    sed -i '' '/extension.*psr/d' "${ini_file:?}"
+    brew tap shivammathur/homebrew-phalcon
+    brew install phalcon@"${version:?}"_"$extension_major_version"
+    sudo cp /usr/local/opt/psr@"${version:?}"/psr.so "${ext_dir:?}"
+    sudo cp /usr/local/opt/phalcon@"${version:?}"_"$extension_major_version"/phalcon.so "${ext_dir:?}"
   fi
 }
 
-# Function to update php ppa
-update_ppa() {
-  if [ "$ppa_updated" = "false" ]; then
-    find /etc/apt/sources.list.d -type f -name 'ondrej-ubuntu-php*.list' -exec sudo DEBIAN_FRONTEND=noninteractive apt-get update -o Dir::Etc::sourcelist="{}" ';' >/dev/null 2>&1
-    ppa_updated="true"
-  fi
+# Function to add phalcon3.
+add_phalcon3() {
+  if [ -e "${ext_dir:?}/phalcon.so" ]; then
+    phalcon_version=$(php -d="extension=phalcon.so" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
+    if [ "$phalcon_version" != "$extension_major_version" ]; then
+      add_phalcon_helper
+    else
+      echo "extension=phalcon.so" | sudo tee -a "$phalcon_ini_file"
+    fi
+  else
+    add_phalcon_helper
+  fi  
 }
 
-# Function to install phalcon
-install_phalcon() {
-  extension=$1
-  version=$2
-  (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"
-}
-
-ini_file="/etc/php/$2/cli/conf.d/50-phalcon.ini"
-ext_dir=$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||")
-semver=$(php -v | head -n 1 | cut -f 2 -d ' ' | cut -f 1 -d '-')
-extension_major_version=$(echo "$1" | grep -i -Po '\d')
-ppa_updated="false"
-tick="✓"
-cross="✗"
-
-if [ "$extension_major_version" = "4" ]; then
-  if [ -e "$ext_dir/psr.so" ] && ! php -m | grep -i -q -w psr; then
-    echo "extension=psr.so" | sudo tee -a "$ini_file" >/dev/null 2>&1
+# Function to add phalcon4.
+add_phalcon4() {
+  if [ -e "${ext_dir:?}/psr.so" ] && ! php -m | grep -i -q -w psr; then
+    echo "extension=psr.so" | sudo tee -a "${ini_file:?}"
   fi
-
   if [ -e "$ext_dir/phalcon.so" ]; then
     if php -m | grep -i -q -w psr; then
       phalcon_version=$(php -d="extension=phalcon" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
       if [ "$phalcon_version" != "$extension_major_version" ]; then
-        install_phalcon "$1" "$2"
+        add_phalcon_helper
       else
-        echo "extension=phalcon.so" | sudo tee -a "$ini_file" >/dev/null 2>&1
-        add_log "$tick" "$1" "Enabled"
+        echo "extension=phalcon.so" | sudo tee -a "$phalcon_ini_file"
       fi
     else
-      install_phalcon "$1" "$2"
+      add_phalcon_helper
     fi
   else
-    install_phalcon "$1" "$2"
-  fi
-fi
+    add_phalcon_helper
+  fi  
+}
 
-if [ "$extension_major_version" = "3" ]; then
-  if [ -e "$ext_dir/phalcon.so" ]; then
-    phalcon_version=$(php -d="extension=phalcon.so" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
-    if [ "$phalcon_version" != "$extension_major_version" ]; then
-      install_phalcon "$1" "$2"
-    else
-      echo "extension=phalcon.so" | sudo tee -a "$ini_file" >/dev/null 2>&1
-      add_log "$tick" "$1" "Enabled"
-    fi
-  else
-    install_phalcon "$1" "$2"
+# Function to add phalcon.
+add_phalcon() {
+  extension=$1
+  status='Enabled'
+  os_name=$(uname -s)
+  phalcon_ini_file="${scan_dir:?}/50-phalcon.ini"
+  extension_major_version=${extension: -1}
+  if [ "$extension_major_version" = "4" ]; then
+    add_phalcon4 >/dev/null 2>&1
+  elif [ "$extension_major_version" = "3" ]; then
+    add_phalcon3 >/dev/null 2>&1
   fi
-fi
+  add_extension_log "phalcon" "$status"
+}

src/scripts/ext/phalcon_darwin.sh

@@ -1,47 +0,0 @@
-# Function to log result of a operation
-add_log() {
-  mark=$1
-  subject=$2
-  message=$3
-  if [ "$mark" = "$tick" ]; then
-    printf "\033[32;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
-  else
-    printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
-  fi
-}
-
-# Function to 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
-    sudo cp /usr/local/opt/phalcon@"$php_version"_"$extension_major"/phalcon.so "$ext_dir" >/dev/null 2>&1
-    add_log "$tick" "$extension" "Installed and enabled"
-  ) || add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
-}
-
-tick="✓"
-cross="✗"
-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")
-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)
-  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=phalcon.so" >>"$ini_file"
-    add_log "$tick" "$extension" "Enabled"
-  fi
-else
-  install_phalcon
-fi

src/scripts/linux.sh

@@ -16,6 +16,16 @@ add_log() {
   fi
 }
 
+# Function to log result of installing extension.
+add_extension_log() {
+  extension=$1
+  status=$2
+  extension_name=$(echo "$extension" | cut -d '-' -f 1)
+  (
+    check_extension "$extension_name" && add_log "$tick" "$extension_name" "$status"
+  ) || add_log "$cross" "$extension_name" "Could not install $extension on PHP $semver"
+}
+
 # Function to read env inputs.
 read_env() {
   . /etc/lsb-release
@@ -25,17 +35,20 @@ read_env() {
   [ "$runner" = false ] && [[ -n ${RUNNER} ]] && runner="${RUNNER}"
 }
 
-# Function to update the package lists.
-update_lists() {
-  if [ "$lists_updated" = "false" ]; then
-    sudo "$debconf_fix" apt-get update >/dev/null 2>&1
-    lists_updated="true"
+# Function to backup and cleanup package lists.
+cleanup_lists() {
+  if [ ! -e /etc/apt/sources.list.d.save ]; then
+    sudo mv /etc/apt/sources.list.d /etc/apt/sources.list.d.save
+    sudo mkdir /etc/apt/sources.list.d
+    sudo mv /etc/apt/sources.list.d.save/*ondrej*.list /etc/apt/sources.list.d/
+    trap "sudo mv /etc/apt/sources.list.d.save/*.list /etc/apt/sources.list.d/" exit
   fi
 }
 
 # Function to add ppa:ondrej/php.
 add_ppa() {
   if ! apt-cache policy | grep -q ondrej/php; then
+    cleanup_lists
     LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y
     if [ "$DISTRIB_RELEASE" = "16.04" ]; then
       sudo "$debconf_fix" apt-get update
@@ -43,6 +56,16 @@ add_ppa() {
   fi
 }
 
+# Function to update the package lists.
+update_lists() {
+  if [ ! -e /tmp/setup_php ]; then
+    [ "$DISTRIB_RELEASE" = "20.04" ] && add_ppa >/dev/null 2>&1
+    cleanup_lists
+    sudo "$debconf_fix" apt-get update >/dev/null 2>&1
+    echo '' | sudo tee "/tmp/setup_php" >/dev/null 2>&1
+  fi
+}
+
 # Function to setup environment for self-hosted runners.
 self_hosted_setup() {
   echo "Set disable_coredump false" | sudo tee -a /etc/sudo.conf
@@ -68,16 +91,22 @@ configure_pecl() {
 # Fuction to get the PECL version of an extension.
 get_pecl_version() {
   extension=$1
-  stability=$2
+  stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot)")"
   pecl_rest='https://pecl.php.net/rest/r/'
-  response=$(curl -q -sSL "$pecl_rest$extension"/allreleases.xml)
-  pecl_version=$(echo "$response" | grep -m 1 -Po "(\d*\.\d*\.\d*$stability\d*)")
+  response=$(curl "${curl_opts[@]}" "$pecl_rest$extension"/allreleases.xml)
+  pecl_version=$(echo "$response" | grep -m 1 -Pio "(\d*\.\d*\.\d*$stability\d*)")
   if [ ! "$pecl_version" ]; then
     pecl_version=$(echo "$response" | grep -m 1 -Po "(\d*\.\d*\.\d*)")
   fi
   echo "$pecl_version"
 }
 
+# Function to install PECL extensions and accept default options
+pecl_install() {
+  local extension=$1
+  yes '' | sudo pecl install -f "$extension" >/dev/null 2>&1
+}
+
 # Function to check if an extension is loaded.
 check_extension() {
   extension=$1
@@ -95,6 +124,7 @@ delete_extension() {
   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
+  [ "$runner" = "self-hosted" ] && $apt_remove "php-$extension"
 }
 
 # Function to disable and delete extensions.
@@ -127,7 +157,7 @@ add_pdo_extension() {
   else
     read -r ext ext_name <<< "$1 $1"
     sudo rm -rf "$scan_dir"/*pdo.ini >/dev/null 2>&1
-    if ! check_extension "pdo"; then echo "extension=pdo.so" >> "$ini_file"; fi
+    if ! check_extension "pdo" 2>/dev/null; then echo "extension=pdo.so" >> "$ini_file"; fi
     if [ "$ext" = "mysql" ]; then
       enable_extension "mysqlnd" "extension"
       ext_name="mysqli"
@@ -135,9 +165,8 @@ add_pdo_extension() {
       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"
+    add_extension "$pdo_ext" "pecl_install $pdo_ext" "extension" >/dev/null 2>&1
+    add_extension_log "$pdo_ext" "Enabled"
   fi
 }
 
@@ -154,10 +183,8 @@ add_extension() {
       install_command="update_lists && ${install_command/5\.[4-5]-$extension/5-$extension=$release_version}"
     fi
     eval "$install_command" >/dev/null 2>&1 ||
-    (update_lists && eval "$install_command" >/dev/null 2>&1) ||
-    sudo pecl install -f "$extension" >/dev/null 2>&1
-    (check_extension "$extension" && add_log "$tick" "$extension" "Installed and enabled") ||
-    add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
+    (update_lists && eval "$install_command" >/dev/null 2>&1) || pecl_install "$extension"
+    add_extension_log "$extension" "Installed and enabled"
   fi
   sudo chmod 777 "$ini_file"
 }
@@ -167,6 +194,9 @@ add_pecl_extension() {
   extension=$1
   pecl_version=$2
   prefix=$3
+  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot).* ]]; then
+    pecl_version=$(get_pecl_version "$extension" "$pecl_version")
+  fi
   if ! check_extension "$extension" && [ -e "$ext_dir/$extension.so" ]; then
     echo "$prefix=$ext_dir/$extension.so" >>"$pecl_file"
   fi
@@ -175,11 +205,8 @@ add_pecl_extension() {
     add_log "$tick" "$extension" "Enabled"
   else
     delete_extension "$extension"
-    (
-      sudo pecl install -f "$extension-$pecl_version" >/dev/null 2>&1 &&
-      check_extension "$extension" &&
-      add_log "$tick" "$extension" "Installed and enabled"
-    ) || add_log "$cross" "$extension" "Could not install $extension-$pecl_version on PHP $semver"
+    pecl_install "$extension-$pecl_version"
+    add_extension_log "$extension-$pecl_version" "Installed and enabled"
   fi
 }
 
@@ -192,21 +219,6 @@ add_unstable_extension() {
   add_pecl_extension "$extension" "$pecl_version" "$prefix"
 }
 
-# Function to update extension.
-update_extension() {
-  extension=$1
-  latest_version=$2
-  current_version=$(php -r "echo phpversion('$extension');")
-  final_version=$(printf "%s\n%s" "$current_version" "$latest_version" | sort | tail -n 1)
-  if [ "$final_version" != "$current_version"  ]; then
-    version_exists=$(apt-cache policy -- *"$extension" | grep "$final_version")
-    if [ -z "$version_exists" ]; then
-      update_lists
-    fi
-    $apt_install php"$version"-"$extension"
-  fi
-}
-
 # Function to install extension from source
 add_extension_from_source() {
   extension=$1
@@ -217,15 +229,29 @@ add_extension_from_source() {
   (
     add_devtools
     delete_extension "$extension"
-    curl -o /tmp/"$extension".tar.gz -sSL https://github.com/"$repo"/archive/"$release".tar.gz
+    curl -o /tmp/"$extension".tar.gz "${curl_opts[@]}" https://github.com/"$repo"/archive/"$release".tar.gz
     tar xf /tmp/"$extension".tar.gz -C /tmp
     cd /tmp/"$extension-$release" || exit 1
     phpize  && ./configure "$args" && make && sudo make install
     enable_extension "$extension" "$prefix"
   ) >/dev/null 2>&1
-  (
-    check_extension "$extension" && add_log "$tick" "$extension" "Installed and enabled"
-  ) || add_log "$cross" "$extension" "Could not install $extension-$release on PHP $semver"
+  add_extension_log "$extension-$release" "Installed and enabled"
+}
+
+# Function to configure composer
+configure_composer() {
+  tool_path=$1
+  sudo ln -sf "$tool_path" "$tool_path.phar"
+  php -r "try {\$p=new Phar('$tool_path.phar', 0);exit(0);} catch(Exception \$e) {exit(1);}"
+  if [ $? -eq 1 ]; then
+    add_log "$cross" "composer" "Could not download composer"
+    exit 1;
+  fi
+  composer -q global config process-timeout 0
+  echo "::add-path::/home/$USER/.composer/vendor/bin"
+  if [ -n "$COMPOSER_TOKEN" ]; then
+    composer -q global config github-oauth.github.com "$COMPOSER_TOKEN"
+  fi
 }
 
 # Function to setup a remote tool.
@@ -236,19 +262,17 @@ add_tool() {
   if [ ! -e "$tool_path" ]; then
     rm -rf "$tool_path"
   fi
-  status_code=$(sudo curl -s -w "%{http_code}" -o "$tool_path" -L "$url")
+  if [ "$tool" = "composer" ]; then
+    IFS="," read -r -a urls <<< "$url"
+    status_code=$(sudo curl -f -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "${urls[0]}") ||
+    status_code=$(sudo curl -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "${urls[1]}")
+  else
+    status_code=$(sudo curl -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "$url")
+  fi
   if [ "$status_code" = "200" ]; then
     sudo chmod a+x "$tool_path"
     if [ "$tool" = "composer" ]; then
-      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
-      # TODO: Remove after composer 2.0 update, fixes peer fingerprint error
-      if [[ "$version" =~ $old_versions ]]; then
-        composer -q global config repos.packagist composer https://repo-ca-bhs-1.packagist.org
-      fi
+      configure_composer "$tool_path"
     elif [ "$tool" = "cs2pr" ]; then
       sudo sed -i 's/\r$//; s/exit(9)/exit(0)/' "$tool_path"
     elif [ "$tool" = "phan" ]; then
@@ -288,32 +312,14 @@ add_devtools() {
   configure_pecl >/dev/null 2>&1
 }
 
-# Function to add blackfire and blackfire-agent.
-add_blackfire() {
-  sudo mkdir -p /var/run/blackfire
-  sudo curl -sSL https://packages.blackfire.io/gpg.key | sudo apt-key add - >/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
-  sudo "$debconf_fix" apt-get update >/dev/null 2>&1
-  $apt_install blackfire-agent >/dev/null 2>&1
-  if [[ -n $BLACKFIRE_SERVER_ID ]] && [[ -n $BLACKFIRE_SERVER_TOKEN ]]; then
-    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
-  fi
-  if [[ -n $BLACKFIRE_CLIENT_ID ]] && [[ -n $BLACKFIRE_CLIENT_TOKEN ]]; then
-    sudo blackfire config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN" >/dev/null 2>&1
-  fi
-  add_log "$tick" "blackfire" "Added"
-  add_log "$tick" "blackfire-agent" "Added"
-}
-
 # Function to setup the nightly build from master branch.
 setup_master() {
-  curl -sSL "$github"/php-builder/releases/latest/download/install.sh | bash -s "$runner"
+  curl "${curl_opts[@]}" "$github"/php-builder/releases/latest/download/install.sh | bash -s "$runner"
 }
 
 # Function to setup PHP 5.3, PHP 5.4 and PHP 5.5.
 setup_old_versions() {
-  curl -sSL "$github"/php5-ubuntu/releases/latest/download/install.sh | bash -s "$version"
+  curl "${curl_opts[@]}" "$github"/php5-ubuntu/releases/latest/download/install.sh | bash -s "$version"
   configure_pecl
   release_version=$(php -v | head -n 1 | cut -d' ' -f 2)
 }
@@ -322,7 +328,7 @@ setup_old_versions() {
 add_pecl() {
   add_devtools >/dev/null 2>&1
   if [ ! -e /usr/bin/pecl ]; then
-    $apt_install php-pear >/dev/null 2>&1
+    $apt_install php-pear >/dev/null 2>&1 || update_lists && $apt_install php-pear >/dev/null 2>&1
   fi
   configure_pecl >/dev/null 2>&1
   add_log "$tick" "PECL" "Added"
@@ -348,14 +354,19 @@ php_semver() {
 
 # Function to install packaged PHP
 add_packaged_php() {
-  update_lists
-  IFS=' ' read -r -a packages <<< "$(echo "curl mbstring xml intl" | sed "s/[^ ]*/php$version-&/g")"
-  $apt_install php"$version" "${packages[@]}"
+  if [ "$runner" = "self-hosted" ] || [ "${use_package_cache:-true}" = "false" ]; then
+    update_lists
+    IFS=' ' read -r -a packages <<< "$(echo "cli curl mbstring xml intl" | sed "s/[^ ]*/php$version-&/g")"
+    $apt_install "${packages[@]}"
+  else
+    curl "${curl_opts[@]}" "$github"/php-ubuntu/releases/latest/download/install.sh | bash -s "$version"
+  fi
 }
 
 # Function to update PHP.
 update_php() {
   initial_version=$(php_semver)
+  use_package_cache="false"
   add_packaged_php
   updated_version=$(php_semver)
   if [ "$updated_version" != "$initial_version" ]; then
@@ -380,7 +391,6 @@ add_php() {
 # Variables
 tick="✓"
 cross="✗"
-lists_updated="false"
 pecl_config="false"
 version=$1
 master_version="8.0"
@@ -388,7 +398,9 @@ old_versions="5.[3-5]"
 debconf_fix="DEBIAN_FRONTEND=noninteractive"
 github="https://github.com/shivammathur"
 apt_install="sudo $debconf_fix apt-fast install -y"
+apt_remove="sudo $debconf_fix apt-fast remove -y"
 tool_path_dir="/usr/local/bin"
+curl_opts=(-sL)
 existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
 
 read_env
@@ -399,8 +411,6 @@ if [ "$runner" = "self-hosted" ]; then
   else
     self_hosted_setup >/dev/null 2>&1
   fi
-elif [ "$DISTRIB_RELEASE" = "20.04" ]; then
-  add_ppa >/dev/null 2>&1
 fi
 
 # Setup PHP
@@ -436,5 +446,6 @@ scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
 ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
 pecl_file="$scan_dir"/99-pecl.ini
 echo '' | sudo tee "$pecl_file" >/dev/null 2>&1
+sudo rm -rf /usr/local/bin/phpunit >/dev/null 2>&1
 sudo chmod 777 "$ini_file" "$pecl_file" "$tool_path_dir"
 add_log "$tick" "PHP" "$status PHP $semver"

src/scripts/tools/blackfire.ps1

@@ -0,0 +1,17 @@
+# Function to add blackfire and blackfire-agent.
+Function Add-Blackfire() {
+  $agent_version = (Invoke-RestMethod https://blackfire.io/api/v1/releases).agent
+  $url = "https://packages.blackfire.io/binaries/blackfire-agent/${agent_version}/blackfire-agent-windows_${arch_name}.zip"
+  Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $bin_dir\blackfire.zip >$null 2>&1
+  Expand-Archive -Path $bin_dir\blackfire.zip -DestinationPath $bin_dir -Force >$null 2>&1
+  Add-ToProfile $current_profile 'blackfire' "New-Alias blackfire $bin_dir\blackfire.exe"
+  Add-ToProfile $current_profile 'blackfire-agent' "New-Alias blackfire-agent $bin_dir\blackfire-agent.exe"
+  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"
+}

src/scripts/tools/blackfire.sh

@@ -0,0 +1,34 @@
+add_blackfire_linux() {
+  sudo mkdir -p /var/run/blackfire
+  sudo curl "${curl_opts[@]:?}" https://packages.blackfire.io/gpg.key | sudo apt-key add -
+  echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list
+  sudo "${debconf_fix:?}" apt-get update
+  ${apt_install:?} blackfire-agent
+}
+
+add_blackfire_darwin() {
+  sudo mkdir -p /usr/local/var/run
+  brew tap --shallow blackfireio/homebrew-blackfire
+  brew install blackfire-agent
+}
+
+blackfire_config() {
+  if [[ -n $BLACKFIRE_SERVER_ID ]] && [[ -n $BLACKFIRE_SERVER_TOKEN ]]; then
+    sudo blackfire-agent --register --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN"
+    [ "$os" = "Linux" ] && sudo /etc/init.d/blackfire-agent restart
+    [ "$os" = "Darwin" ] && brew services start blackfire-agent
+  fi
+  if [[ -n $BLACKFIRE_CLIENT_ID ]] && [[ -n $BLACKFIRE_CLIENT_TOKEN ]]; then
+    blackfire config --client-id="$BLACKFIRE_CLIENT_ID" --client-token="$BLACKFIRE_CLIENT_TOKEN"
+  fi
+}
+
+# Function to add blackfire and blackfire-agent.
+add_blackfire() {
+  os="$(uname -s)"
+  [ "$os" = "Linux" ] && add_blackfire_linux >/dev/null 2>&1
+  [ "$os" = "Darwin" ] && add_blackfire_darwin >/dev/null 2>&1
+  blackfire_config >/dev/null 2>&1
+  add_log "${tick:?}" "blackfire" "Added"
+  add_log "${tick:?}" "blackfire-agent" "Added"
+}

src/scripts/tools/grpc_php_plugin.ps1

@@ -0,0 +1,20 @@
+Function Add-Msys2() {
+  $msys_location = 'C:\msys64'
+  if (-not(Test-Path $msys_location)) {
+    choco install msys2 -y >$null 2>&1
+    $msys_location = 'C:\tools\msys64'
+  }
+  return $msys_location
+}
+
+Function Add-Grpc_php_plugin() {
+  $msys_location = Add-Msys2
+  . $msys_location\usr\bin\bash -l -c "pacman -S --noconfirm mingw-w64-x86_64-grpc" >$null 2>&1
+  Write-Output "::add-path::$msys_location\mingw64\bin"
+  Write-Output "::set-output name=grpc_php_plugin_path::$msys_location\mingw64\bin\grpc_php_plugin.exe"
+  Add-ToProfile $current_profile 'grpc_php_plugin' "New-Alias grpc_php_plugin $msys_location\mingw64\bin\grpc_php_plugin.exe"
+  Add-Log $tick "grpc_php_plugin" "Added"
+  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "grpc_php_plugin" "Click to read the grpc_php_plugin related license information"
+  Write-Output (Invoke-WebRequest https://raw.githubusercontent.com/grpc/grpc/master/LICENSE).Content
+  Write-Output "::endgroup::"
+}

src/scripts/tools/grpc_php_plugin.sh

@@ -0,0 +1,51 @@
+add_bazel() {
+  if [ ! "$(command -v bazel)" ]; then
+    os=$(uname -s)
+    if [ "$os" = "Linux" ]; then
+      ${apt_install:?} curl gnupg
+      curl "${curl_opts[@]:?}" https://bazel.build/bazel-release.pub.gpg | sudo apt-key add -
+      echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | sudo tee /etc/apt/sources.list.d/bazel.list
+      sudo "${debconf_fix:?}" apt-get update -y
+      ${apt_install:?} bazel
+    elif [ "$os" = "Darwin" ]; then
+      brew install bazel
+    fi
+  fi
+}
+
+get_grpc_tag() {
+  if [ "$grpc_tag" = "latest" ]; then
+    grpc_tag=$(curl "${curl_opts[@]:?}" https://grpc.io/release)
+  else
+    status_code=$(sudo curl -s -w "%{http_code}" -o /tmp/grpc.tmp "${curl_opts[@]:?}" "https://github.com/grpc/grpc/releases/tag/v$grpc_tag")
+    if [ "$status_code" = "200" ]; then
+      grpc_tag="v$grpc_tag"
+    else
+      grpc_tag=$(curl "${curl_opts[@]:?}" https://grpc.io/release)
+    fi
+  fi
+}
+
+add_grpc_php_plugin() {
+  grpc_tag=$1
+  get_grpc_tag
+  (
+    curl "${curl_opts[@]:?}" "https://github.com/grpc/grpc/archive/$grpc_tag.tar.gz" | tar -xz -C /tmp
+    cd "/tmp/grpc-${grpc_tag:1}" || exit
+    add_bazel
+    echo "os: $os"
+    echo "release: $DISTRIB_RELEASE"
+    if [ "$DISTRIB_RELEASE" = "16.04" ]; then
+      CC="$(command -v gcc)" CXX="$(command -v g++)" ./tools/bazel build src/compiler:grpc_php_plugin
+    else
+      ./tools/bazel build src/compiler:grpc_php_plugin
+    fi
+    sudo mv ./bazel-bin/src/compiler/grpc_php_plugin /usr/local/bin/grpc_php_plugin
+    sudo chmod a+x /usr/local/bin/grpc_php_plugin
+  ) >/dev/null 2>&1
+  echo "::set-output name=grpc_php_plugin_path::/usr/local/bin/grpc_php_plugin"
+  add_log "${tick:?}" "grpc_php_plugin" "Added"
+  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "grpc_php_plugin" "Click to read the grpc_php_plugin related license information"
+  cat "/tmp/grpc-${grpc_tag:1}/LICENSE"
+  echo "::endgroup::"
+}

src/scripts/tools/protoc.ps1

@@ -0,0 +1,38 @@
+Function Get-ProtobufTag() {
+  if("$protobuf_tag" -eq "latest") {
+    $protobuf_tag = (Invoke-RestMethod https://api.github.com/repos/protocolbuffers/protobuf/tags).Name | Where-Object { $_ -match "v\d+.\d+.\d+$" } | Select-Object -First 1
+  } else {
+    try {
+      [net.httpWebRequest] $request = [net.webRequest]::create("https://github.com/protocolbuffers/protobuf/releases/tag/v$protobuf_tag")
+      $req.Method = "HEAD"
+      [net.httpWebResponse] $response = $request.getResponse()
+      $response.Close()
+      $protobuf_tag = "v$protobuf_tag"
+    } catch {
+      $protobuf_tag = (Invoke-RestMethod https://api.github.com/repos/protocolbuffers/protobuf/tags).Name | Where-Object { $_ -match "v\d+.\d+.\d+$" } | Select-Object -First 1
+    }
+  }
+  return $protobuf_tag
+}
+
+Function Add-Protoc() {
+  param(
+    [Parameter(Mandatory = $true, Position = 0, HelpMessage = 'The PHP version to be installed')]
+    [ValidatePattern('^latest$|^(v?)\d+\.\d+\.\d+$')]
+    [string] $protobuf_tag
+  )
+  $protobuf_tag = Get-ProtobufTag
+  $arch_num = '64'
+  if(-not([Environment]::Is64BitOperatingSystem)) {
+    $arch_num = '32'
+  }
+  $url = "https://github.com/protocolbuffers/protobuf/releases/download/$protobuf_tag/protoc-$($protobuf_tag -replace 'v', '')-win$arch_num.zip"
+  Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $bin_dir\protoc.zip >$null 2>&1
+  Expand-Archive -Path $bin_dir\protoc.zip -DestinationPath $bin_dir\protoc -Force >$null 2>&1
+  Move-Item -Path $bin_dir\protoc\bin\protoc.exe -Destination $bin_dir\protoc.exe
+  Add-ToProfile $current_profile 'protoc' "New-Alias protoc $bin_dir\protoc.exe"
+  Add-Log $tick "protoc" "Added"
+  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "protoc" "Click to read the protoc related license information"
+  Write-Output (Invoke-WebRequest https://raw.githubusercontent.com/protocolbuffers/protobuf/master/LICENSE).Content
+  Write-Output "::endgroup::"
+}

src/scripts/tools/protoc.sh

@@ -0,0 +1,28 @@
+get_protobuf_tag() {
+  if [ "$protobuf_tag" = "latest" ]; then
+    protobuf_tag=$(curl "${curl_opts[@]:?}" https://github.com/protocolbuffers/protobuf/releases/latest 2<&1 | grep -m 1 -Eo "(v[0-9]+.[0-9]+.[0-9]+)" | head -n 1)
+  else
+    status_code=$(sudo curl -s -w "%{http_code}" -o /tmp/protobuf.tmp "${curl_opts[@]:?}" "https://github.com/protocolbuffers/protobuf/releases/tag/v$protobuf_tag")
+    if [ "$status_code" = "200" ]; then
+      protobuf_tag="v$protobuf_tag"
+    else
+      protobuf_tag=$(curl "${curl_opts[@]:?}" https://github.com/protocolbuffers/protobuf/releases/latest 2<&1 | grep -m 1 -Eo "(v[0-9]+.[0-9]+.[0-9]+)" | head -n 1)
+    fi
+  fi
+}
+
+add_protoc() {
+  protobuf_tag=$1
+  get_protobuf_tag
+  (
+    platform='linux'
+    [ "$(uname -s)" = "Darwin" ] && platform='osx'
+    curl -o /tmp/protobuf.zip "${curl_opts[@]:?}" "https://github.com/protocolbuffers/protobuf/releases/download/$protobuf_tag/protoc-${protobuf_tag:1}-$platform-x86_64.zip"
+    sudo unzip /tmp/protobuf.zip -d /usr/local/
+    sudo chmod 777 /usr/local/bin/protoc -R /usr/local/include/google
+  ) >/dev/null 2>&1
+  add_log "${tick:?}" "protoc" "Added"
+  printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "protoc" "Click to read the protoc related license information"
+  curl "${curl_opts[@]:?}" https://raw.githubusercontent.com/protocolbuffers/protobuf/master/LICENSE
+  echo "::endgroup::"
+}

src/scripts/win32.ps1

@@ -77,8 +77,8 @@ Function Get-CleanPSProfile {
 Function Install-PhpManager() {
   $repo = "mlocati/powershell-phpmanager"
   $tag = (Invoke-RestMethod https://api.github.com/repos/$repo/tags)[0].Name
-  $module_path = "$bin_dir\PhpManager\powershell-phpmanager-$tag\PhpManager"
-  if(-not (Test-Path $module_path\PhpManager.psm1 -PathType Leaf)) {
+  $module_path = "$bin_dir\PhpManager\powershell-phpmanager-$tag\PhpManager\PhpManager.psm1"
+  if(-not (Test-Path $module_path -PathType Leaf)) {
     $zip_file = "$bin_dir\PhpManager.zip"
     Invoke-WebRequest -UseBasicParsing -Uri https://github.com/$repo/archive/$tag.zip -OutFile $zip_file
     Expand-Archive -Path $zip_file -DestinationPath $bin_dir\PhpManager -Force
@@ -99,7 +99,7 @@ Function Add-Extension {
     [ValidateNotNull()]
     [ValidateSet('stable', 'beta', 'alpha', 'devel', 'snapshot')]
     [string]
-    $mininum_stability = 'stable',
+    $stability = 'stable',
     [Parameter(Position = 2, Mandatory = $false)]
     [ValidateNotNull()]
     [ValidatePattern('^\d+(\.\d+){0,2}$')]
@@ -124,9 +124,9 @@ Function Add-Extension {
     }
     else {
       if($extension_version -ne '') {
-        Install-PhpExtension -Extension $extension -Version $extension_version -MinimumStability $mininum_stability -Path $php_dir
+        Install-PhpExtension -Extension $extension -Version $extension_version -MinimumStability $stability -MaximumStability $stability -Path $php_dir
       } else {
-        Install-PhpExtension -Extension $extension -MinimumStability $mininum_stability -Path $php_dir
+        Install-PhpExtension -Extension $extension -MinimumStability $stability -MaximumStability $stability -Path $php_dir
       }
 
       Add-Log $tick $extension "Installed and enabled"
@@ -161,13 +161,32 @@ Function Remove-Extension() {
   }
 }
 
+Function Edit-ComposerConfig() {
+  Param(
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateLength(1, [int]::MaxValue)]
+    [string]
+    $tool_path
+  )
+  Copy-Item $tool_path -Destination "$tool_path.phar"
+  php -r "try {`$p=new Phar('$tool_path.phar', 0);exit(0);} catch(Exception `$e) {exit(1);}"
+  if ($? -eq $False) {
+    Add-Log "$cross" "composer" "Could not download composer"
+    exit 1;
+  }
+  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
+  }
+}
+
 # Function to add tools.
 Function Add-Tool() {
   Param (
     [Parameter(Position = 0, Mandatory = $true)]
     [ValidateNotNull()]
-    [ValidateLength(1, [int]::MaxValue)]
-    [string]
     $url,
     [Parameter(Position = 1, Mandatory = $true)]
     [ValidateNotNull()]
@@ -178,6 +197,7 @@ Function Add-Tool() {
   if (Test-Path $bin_dir\$tool) {
     Remove-Item $bin_dir\$tool
   }
+  if($url.Count -gt 1) { $url = $url[0] }
   if ($tool -eq "symfony") {
     Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $bin_dir\$tool.exe
     Add-ToProfile $current_profile $tool "New-Alias $tool $bin_dir\$tool.exe" >$null 2>&1
@@ -201,15 +221,7 @@ Function Add-Tool() {
   } elseif($tool -eq "cs2pr") {
     (Get-Content $bin_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $bin_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
-    }
-    # TODO: Remove after composer 2.0 update, fixes peer fingerprint error
-    if ($version -lt 5.6) {
-      composer -q global config repos.packagist composer https://repo-ca-bhs-1.packagist.org
-    }
+    Edit-ComposerConfig $bin_dir\$tool
   } elseif($tool -eq "wp-cli") {
     Copy-Item $bin_dir\wp-cli.bat -Destination $bin_dir\wp.bat
   }
@@ -252,25 +264,6 @@ Function Add-Pecl() {
   Add-Log $tick "PECL" "Use extensions input to setup PECL extensions on windows"
 }
 
-# Function to add blackfire and blackfire-agent.
-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 $bin_dir\blackfire.zip >$null 2>&1
-  Expand-Archive -Path $bin_dir\blackfire.zip -DestinationPath $bin_dir -Force >$null 2>&1
-  Add-ToProfile $current_profile 'blackfire' "New-Alias blackfire $bin_dir\blackfire.exe"
-  Add-ToProfile $current_profile 'blackfire-agent' "New-Alias blackfire-agent $bin_dir\blackfire-agent.exe"
-  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)
@@ -341,9 +334,11 @@ if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version
   }
   if ($version -eq $master_version) {
     $version = 'master'
+    Invoke-WebRequest -UseBasicParsing -Uri https://dl.bintray.com/shivammathur/php/Install-PhpMaster.ps1 -OutFile $php_dir\Install-PhpMaster.ps1 > $null 2>&1
+    & $php_dir\Install-PhpMaster.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir
+  } else {
+    Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force > $null 2>&1
   }
-
-  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') {
     Update-Php $php_dir >$null 2>&1
@@ -355,16 +350,14 @@ if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version
 
 $installed = Get-Php -Path $php_dir
 Set-PhpIniKey -Key 'date.timezone' -Value 'UTC' -Path $php_dir
+Set-PhpIniKey -Key 'memory_limit' -Value '-1' -Path $php_dir
 if($version -lt "5.5") {
+  ForEach($lib in "libeay32.dll", "ssleay32.dll") {
+    Invoke-WebRequest -UseBasicParsing -Uri https://dl.bintray.com/shivammathur/php/$lib -OutFile $php_dir\$lib >$null 2>&1
+  }
   Enable-PhpExtension -Extension openssl, curl, mbstring -Path $php_dir
 } else {
   Enable-PhpExtension -Extension openssl, curl, opcache, mbstring -Path $php_dir
 }
 Update-PhpCAInfo -Path $php_dir -Source $cert_source
-if ($version -eq 'master') {
-  Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/shivammathur/php-extensions-windows/releases/latest/download/php_$env:phpts`_$arch`_pcov.dll" -OutFile $ext_dir"\php_pcov.dll" >$null 2>&1
-  Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/shivammathur/php-extensions-windows/releases/latest/download/php_$env:phpts`_$arch`_xdebug.dll" -OutFile $ext_dir"\php_xdebug.dll" >$null 2>&1
-  Set-PhpIniKey -Key 'opcache.jit_buffer_size' -Value '256M' -Path $php_dir
-  Set-PhpIniKey -Key 'opcache.jit' -Value '1235' -Path $php_dir
-}
 Add-Log $tick "PHP" "$status PHP $($installed.FullVersion)"

src/tools.ts

@@ -1,30 +1,5 @@
 import * as utils from './utils';
 
-/**
- * Function to get command to setup tools
- *
- * @param os_version
- * @param suffix
- */
-export async function getCommand(
-  os_version: string,
-  suffix: string
-): Promise<string> {
-  switch (os_version) {
-    case 'linux':
-    case 'darwin':
-      return 'add_' + suffix + ' ';
-    case 'win32':
-      return 'Add-' + suffix.charAt(0).toUpperCase() + suffix.slice(1) + ' ';
-    default:
-      return await utils.log(
-        'Platform ' + os_version + ' is not supported',
-        os_version,
-        'error'
-      );
-  }
-}
-
 /**
  * Function to get tool version
  *
@@ -36,6 +11,8 @@ export async function getToolVersion(version: string): Promise<string> {
   const composer_regex = /^stable$|^preview$|^snapshot$|^v?[1|2]$/;
   version = version.replace(/[><=^]*/, '');
   switch (true) {
+    case version.charAt(0) == 'v':
+      return version.replace('v', '');
     case composer_regex.test(version):
     case semver_regex.test(version):
       return version;
@@ -189,12 +166,12 @@ export async function addPhive(
   switch (version) {
     case 'latest':
       return (
-        (await getCommand(os_version, 'tool')) +
+        (await utils.getCommand(os_version, 'tool')) +
         'https://phar.io/releases/phive.phar phive'
       );
     default:
       return (
-        (await getCommand(os_version, 'tool')) +
+        (await utils.getCommand(os_version, 'tool')) +
         'https://github.com/phar-io/phive/releases/download/' +
         version +
         '/phive-' +
@@ -319,27 +296,26 @@ export async function addComposer(tools_list: string[]): Promise<string[]> {
 }
 
 /**
- * Function to get script to update composer
+ * Function to get composer URL for a given version
  *
  * @param version
- * @param os_version
  */
-export async function updateComposer(
-  version: string,
-  os_version: string
-): Promise<string> {
+export async function getComposerUrl(version: string): Promise<string> {
+  const cache_url =
+    'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-' +
+    version.replace('latest', 'stable') +
+    '.phar,';
   switch (version) {
     case 'snapshot':
+      return cache_url + 'https://getcomposer.org/composer.phar';
     case 'preview':
     case '1':
     case '2':
       return (
-        '\ncomposer self-update --' +
-        version +
-        (await utils.suppressOutput(os_version))
+        cache_url + 'https://getcomposer.org/composer-' + version + '.phar'
       );
     default:
-      return '';
+      return cache_url + 'https://getcomposer.org/composer-stable.phar';
   }
 }
 
@@ -358,7 +334,7 @@ export async function getCleanedToolsList(
       return extension
         .trim()
         .replace(
-          /hirak\/|laravel\/|narrowspark\/automatic-|overtrue\/|robmorgan\/|symfony\//,
+          /-agent|hirak\/|laravel\/|narrowspark\/automatic-|overtrue\/|robmorgan\/|symfony\//,
           ''
         );
     })
@@ -380,7 +356,7 @@ export async function addArchive(
   url: string,
   os_version: string
 ): Promise<string> {
-  return (await getCommand(os_version, 'tool')) + url + ' ' + tool;
+  return (await utils.getCommand(os_version, 'tool')) + url + ' ' + tool;
 }
 
 /**
@@ -432,7 +408,7 @@ export async function addPackage(
   prefix: string,
   os_version: string
 ): Promise<string> {
-  const tool_command = await getCommand(os_version, 'composertool');
+  const tool_command = await utils.getCommand(os_version, 'composertool');
   return tool_command + tool + ' ' + release + ' ' + prefix;
 }
 
@@ -467,87 +443,29 @@ export async function addTools(
     let url = '';
     switch (tool) {
       case 'blackfire':
-      case 'blackfire-agent':
-        script += await getCommand(os_version, 'blackfire');
+      case 'grpc_php_plugin':
+      case 'protoc':
+        script += await utils.customPackage(tool, 'tools', version, os_version);
         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;
-        script += await addArchive(tool, version, url, os_version);
-        break;
-      case 'phpcs':
-      case 'phpcbf':
-        url = github + 'squizlabs/PHP_CodeSniffer/' + uri;
-        script += await addArchive(tool, version, url, os_version);
-        break;
-      case 'phan':
-        url = github + 'phan/phan/' + uri;
-        script += await addArchive(tool, version, url, os_version);
-        break;
-      case 'phive':
-        script += await addPhive(version, os_version);
-        break;
-      case 'phpstan':
-        url = github + 'phpstan/phpstan/' + uri;
-        script += await addArchive(tool, version, url, os_version);
-        break;
-      case 'phpmd':
-        url = github + 'phpmd/phpmd/' + uri;
-        script += await addArchive(tool, version, url, os_version);
-        break;
-      case 'psalm':
-        url = github + 'vimeo/psalm/' + uri;
-        script += await addArchive(tool, version, url, os_version);
-        break;
-      case 'composer':
-        url = 'https://getcomposer.org/composer-stable.phar';
-        script +=
-          (await addArchive('composer', version, url, os_version)) +
-          (await updateComposer(version, os_version));
-        break;
       case 'codeception':
         url =
           'https://codeception.com/' +
           (await getCodeceptionUri(version, php_version));
         script += await addArchive(tool, version, url, os_version);
         break;
-      case 'phpcpd':
-      case 'phpunit':
-        url = await getPharUrl('https://phar.phpunit.de', tool, '', version);
+      case 'composer':
+        url = await getComposerUrl(version);
+        script += await addArchive('composer', version, url, os_version);
+        break;
+      case 'composer-normalize':
+        uri = await getUri(tool, '.phar', version, 'releases', '', 'download');
+        url = github + 'ergebnis/composer-normalize/' + uri;
         script += await addArchive(tool, version, url, os_version);
         break;
-      case 'deployer':
-        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 'phplint':
-        script += await addPackage(tool, release, 'overtrue/', 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,
@@ -556,19 +474,91 @@ export async function addTools(
           os_version
         );
         break;
+      case 'composer-require-checker':
+        uri = await getUri(tool, '.phar', version, 'releases', '', 'download');
+        url = github + 'maglnet/ComposerRequireChecker/' + uri;
+        script += await addArchive(tool, version, url, os_version);
+        break;
+      case 'composer-unused':
+        uri = await getUri(tool, '.phar', version, 'releases', '', 'download');
+        url = github + 'composer-unused/composer-unused/' + uri;
+        script += await addArchive(tool, version, url, os_version);
+        break;
+      case 'cs2pr':
+        uri = await getUri(tool, '', version, 'releases', '', 'download');
+        url = github + 'staabm/annotate-pull-request-from-checkstyle/' + uri;
+        script += await addArchive(tool, version, url, os_version);
+        break;
+      case 'deployer':
+        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 'infection':
+        url = github + 'infection/infection/' + uri;
+        script += await addArchive(tool, version, url, os_version);
+        break;
       case 'pecl':
-        script += await getCommand(os_version, 'pecl');
+        script += await utils.getCommand(os_version, 'pecl');
+        break;
+      case 'phan':
+        url = github + 'phan/phan/' + uri;
+        script += await addArchive(tool, version, url, os_version);
+        break;
+      case 'phinx':
+        script += await addPackage(tool, release, 'robmorgan/', os_version);
+        break;
+      case 'phive':
+        script += await addPhive(version, os_version);
         break;
       case 'php-config':
       case 'phpize':
         script += await addDevTools(tool, os_version);
         break;
+      case 'php-cs-fixer':
+        uri = await getUri(tool, '.phar', version, 'releases', 'v', 'download');
+        url = github + 'FriendsOfPHP/PHP-CS-Fixer/' + uri;
+        script += await addArchive(tool, version, url, os_version);
+        break;
+      case 'phpcbf':
+      case 'phpcs':
+        url = github + 'squizlabs/PHP_CodeSniffer/' + uri;
+        script += await addArchive(tool, version, url, os_version);
+        break;
+      case 'phpcpd':
+      case 'phpunit':
+        url = await getPharUrl('https://phar.phpunit.de', tool, '', version);
+        script += await addArchive(tool, version, url, os_version);
+        break;
+      case 'phplint':
+        script += await addPackage(tool, release, 'overtrue/', os_version);
+        break;
+      case 'phpmd':
+        url = github + 'phpmd/phpmd/' + uri;
+        script += await addArchive(tool, version, url, os_version);
+        break;
+      case 'phpstan':
+        url = github + 'phpstan/phpstan/' + uri;
+        script += await addArchive(tool, version, url, os_version);
+        break;
+      case 'prestissimo':
+        script += await addPackage(tool, release, 'hirak/', os_version);
+        break;
+      case 'psalm':
+        url = github + 'vimeo/psalm/' + uri;
+        script += await addArchive(tool, version, url, os_version);
+        break;
       case 'symfony':
       case 'symfony-cli':
         uri = await getSymfonyUri(version, os_version);
         url = github + 'symfony/cli/' + uri;
         script += await addArchive('symfony', version, url, os_version);
         break;
+      case 'vapor-cli':
+        script += await addPackage(tool, release, 'laravel/', os_version);
+        break;
       case 'wp-cli':
         url = github + (await getWpCliUrl(version));
         script += await addArchive(tool, version, url, os_version);

src/utils.ts

@@ -259,3 +259,106 @@ export async function suppressOutput(os_version: string): Promise<string> {
       );
   }
 }
+
+/**
+ * Function to get script to log unsupported extensions.
+ *
+ * @param extension
+ * @param version
+ * @param os_version
+ */
+export async function getUnsupportedLog(
+  extension: string,
+  version: string,
+  os_version: string
+): Promise<string> {
+  return (
+    '\n' +
+    (await addLog(
+      '$cross',
+      extension,
+      [extension, 'is not supported on PHP', version].join(' '),
+      os_version
+    )) +
+    '\n'
+  );
+}
+
+/**
+ * Function to get command to setup tools
+ *
+ * @param os_version
+ * @param suffix
+ */
+export async function getCommand(
+  os_version: string,
+  suffix: string
+): Promise<string> {
+  switch (os_version) {
+    case 'linux':
+    case 'darwin':
+      return 'add_' + suffix + ' ';
+    case 'win32':
+      return 'Add-' + suffix.charAt(0).toUpperCase() + suffix.slice(1) + ' ';
+    default:
+      return await log(
+        'Platform ' + os_version + ' is not supported',
+        os_version,
+        'error'
+      );
+  }
+}
+
+/**
+ * Function to join strings with space
+ *
+ * @param str
+ */
+export async function joins(...str: string[]): Promise<string> {
+  return [...str].join(' ');
+}
+
+/**
+ * Function to get script extensions
+ *
+ * @param os_version
+ */
+export async function scriptExtension(os_version: string): Promise<string> {
+  switch (os_version) {
+    case 'win32':
+      return '.ps1';
+    case 'linux':
+    case 'darwin':
+      return '.sh';
+    default:
+      return await log(
+        'Platform ' + os_version + ' is not supported',
+        os_version,
+        'error'
+      );
+  }
+}
+
+/**
+ * Function to get script to add tools with custom support.
+ *
+ * @param pkg
+ * @param type
+ * @param version
+ * @param os_version
+ */
+export async function customPackage(
+  pkg: string,
+  type: string,
+  version: string,
+  os_version: string
+): Promise<string> {
+  const pkg_name: string = pkg.replace(/\d+|pdo[_-]/, '');
+  const script_extension: string = await scriptExtension(os_version);
+  const script: string = path.join(
+    __dirname,
+    '../src/scripts/' + type + '/' + pkg_name + script_extension
+  );
+  const command: string = await getCommand(os_version, pkg_name);
+  return '\n. ' + script + '\n' + command + version;
+}