Add patch for PCRE2

Update readme about composer (Fixed errors)

.github/SECURITY.md

@@ -6,8 +6,8 @@ The following versions of this project are supported for security updates.
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 1.10.x  | :white_check_mark: |
+| 1.11.x  | :white_check_mark: |
-| 2.8.x   | :white_check_mark: |
+| 2.11.x   | :white_check_mark: |
 
 ## Supported PHP Versions
 
@@ -15,7 +15,6 @@ This security policy only applies to the latest patches of the following PHP ver
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 7.2     | :white_check_mark: |
 | 7.3     | :white_check_mark: |
 | 7.4     | :white_check_mark: |
 | 8.0     | :white_check_mark: |

.github/workflows/node-workflow.yml

@@ -28,10 +28,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Setup Node.js 14.x
+      - name: Setup Node.js 15.x
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 15.x
 
       - name: Install dependencies
         run: npm install
@@ -48,4 +48,4 @@ jobs:
       - name: Send Coverage
         continue-on-error: true
         timeout-minutes: 1
-        run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/clover.xml -n github-actions-codecov-${{ matrix.operating-system }}
+        run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/lcov.info -n github-actions-codecov-${{ matrix.operating-system }}

LICENSE

@@ -1,7 +1,7 @@
 
 The MIT License (MIT)
 
-Copyright (c) 2019-2020 shivammathur and contributors
+Copyright (c) 2019-2021 shivammathur and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -66,18 +66,17 @@ Both `GitHub-hosted` and `self-hosted` runners are suppported by `setup-php` on
 
 |Virtual environment|YAML workflow label|Pre-installed PHP|
 |--- |--- |--- |
-|Ubuntu 16.04|`ubuntu-16.04`|`PHP 5.6` to `PHP 8.0`|
+|Ubuntu 16.04 [(deprecated)](https://setup-php.com/i/452)|`ubuntu-16.04`|`PHP 5.6` to `PHP 8.0`|
 |Ubuntu 18.04|`ubuntu-18.04`|`PHP 7.1` to `PHP 8.0`|
 |Ubuntu 20.04|`ubuntu-latest` or `ubuntu-20.04`|`PHP 7.4` to `PHP 8.0`|
 |Windows Server 2019|`windows-latest` or `windows-2019`|`PHP 8.0`|
 |macOS Catalina 10.15|`macos-latest` or `macos-10.15`|`PHP 8.0`|
-|macOS Big Sur 11.0|`macos-11.0`|`PHP 8.0`|
+|macOS Big Sur 11.x|`macos-11.0`|`PHP 8.0`|
 
 ### Self-Hosted Runners
 
 |Host OS/Virtual environment|YAML workflow label|
 |--- |--- |
-|Ubuntu 16.04|`self-hosted` or `Linux`|
 |Ubuntu 18.04|`self-hosted` or `Linux`|
 |Ubuntu 20.04|`self-hosted` or `Linux`|
 |Windows 7 and newer|`self-hosted` or `Windows`|
@@ -117,7 +116,7 @@ On all supported OS/Platforms the following PHP versions are supported as per th
 
 PHP extensions can be setup using the `extensions` input. It accepts a `string` in csv-format.
 
-- On `Ubuntu`, extensions which are available as a package, available on `PECL`, or hosted on GitHub can be setup.
+- On `Ubuntu`, extensions which are available as a package, available on `PECL` or a git repository can be set up.
 
 ```yaml
 - name: Setup PHP with PECL extension
@@ -129,7 +128,9 @@ PHP extensions can be setup using the `extensions` input. It accepts a `string`
 
 - On `Windows`, extensions available on `PECL` which have the `DLL` binary can be set up.
 
-- On `macOS`, extensions available on `PECL` or hosted on GitHub can be installed.
+- On `macOS`, extensions available on `PECL` or a git repository can be set up.
+
+- On `Ubuntu` and `macOS` to compile and install an extension from a git repository follow this [guide](https://github.com/shivammathur/setup-php/wiki/Add-extension-from-source "Guide to compile and install PHP extensions in setup-php").
 
 - Extensions installed along with PHP if specified are enabled.
 
@@ -163,14 +164,14 @@ PHP extensions can be setup using the `extensions` input. It accepts a `string`
     extensions: :opcache
 ```
 
-- Extension `intl` can be setup with specific `ICU` version for `PHP 5.6` to `PHP 8.0` in `Ubuntu` workflows by suffixing `intl` with the `ICU` version. `ICU 50.2` and newer versions are supported. Refer to [`ICU builds`](https://github.com/shivammathur/icu-intl#icu4c-builds) for the specific versions supported.
+- Extension `intl` can be setup with specific `ICU` version for `PHP 5.6` and above in `Ubuntu` workflows by suffixing `intl` with the `ICU` version. `ICU 50.2` and newer versions are supported. Refer to [`ICU builds`](https://github.com/shivammathur/icu-intl#icu4c-builds) for the specific versions supported.
 
 ```yaml
 - name: Setup PHP with intl
   uses: shivammathur/setup-php@v2
   with:
     php-version: '7.4'
-    extensions: intl-68.2
+    extensions: intl-69.1
 ```
 
 - Extensions loaded by default after `setup-php` runs can be found on the [wiki](https://github.com/shivammathur/setup-php/wiki).
@@ -178,7 +179,7 @@ PHP extensions can be setup using the `extensions` input. It accepts a `string`
 - These extensions have custom support:
   - `cubrid`, `pdo_cubrid` and `gearman` on `Ubuntu`.
   - `geos` on `Ubuntu` and `macOS`.
-  - `blackfire`, `couchbase`, `ioncube`, `oci8`, `pdo_oci`, `pecl_http`, `phalcon3` and `phalcon4` on all supported OS.
+  - `blackfire`, `couchbase`, `ioncube`, `oci8`, `pdo_firebird`, `pdo_oci`, `pecl_http`, `phalcon3` and `phalcon4` on all supported OS.
 
 - By default, extensions which cannot be added or removed gracefully leave an error message in the logs, the action is not interrupted. To change this behaviour you can set `fail-fast` flag to `true`. 
 
@@ -192,18 +193,6 @@ PHP extensions can be setup using the `extensions` input. It accepts a `string`
     fail-fast: true
 ```
 
-- Extensions can be compiled from source if they are hosted on GitHub. In this case, the version specification contains the repository and branch/tag to clone: 
-
-```yaml
-- name: Setup PHP and remove shared extension
-  uses: shivammathur/setup-php@v2
-  with:
-    php-version: '7.4'  
-    extensions: mongodb-mongodb/mongo-php-driver@v1.9
-```
-
-The version can be a branch name or tag as supported by `git clone -b <name>`. The clone is performed recursively, i.e. submodules will be cloned as well.
-
 ## :wrench: Tools Support
 
 These tools can be setup globally using the `tools` input. It accepts a string in csv-format.
@@ -228,6 +217,16 @@ These tools can be setup globally using the `tools` input. It accepts a string i
     tools: composer:v2
 ```
 
+- If you do not use composer in your workflow, you can specify `tools: none` to skip it.
+
+```yaml
+- name: Setup PHP without composer
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '7.4'
+    tools: none
+```
+
 - Tools `prestissimo` and `composer-prefetcher` will be skipped unless `composer:v1` is also specified in tools input. It is recommended to drop `prestissimo` and use `composer v2`.
 
 - The latest versions of both agent `blackfire-agent` and client `blackfire` are setup when `blackfire` is specified in tools input. Please refer to the [official documentation](https://blackfire.io/docs/integrations/ci/github-actions "Blackfire.io documentation for GitHub Actions") for using `blackfire` with GitHub Actions.
@@ -242,6 +241,16 @@ These tools can be setup globally using the `tools` input. It accepts a string i
     tools: phpunit:8.5.8
 ```
 
+- Any composer tool or package can also be set up globally by specifying it as `vendor/package`. For example to set up `psalm`.
+
+```yaml
+- name: Setup PHP with tools
+  uses: shivammathur/setup-php@v2
+  with:
+    php-version: '7.4'
+    tools: vimeo/psalm
+```
+
 - By default, tools which cannot be set up gracefully leave an error message in the logs, the action is not interrupted. To change this behaviour you can set `fail-fast` flag to `true`.
 
 ```yaml
@@ -263,7 +272,7 @@ These tools can be setup globally using the `tools` input. It accepts a string i
 
 ### Xdebug
 
-Specify `coverage: xdebug` to use `Xdebug`.  
+Specify `coverage: xdebug` to use `Xdebug` and disable `PCOV`.  
 Runs on all [PHP versions supported](#tada-php-support "List of PHP versions supported on this GitHub Action").
 
 ```yaml
@@ -287,10 +296,9 @@ Runs on all [PHP versions supported](#tada-php-support "List of PHP versions sup
 
 ### PCOV
 
-Specify `coverage: pcov` to use PCOV and disable Xdebug.  
+Specify `coverage: pcov` to use `PCOV` and disable `Xdebug`.  
 Runs on PHP 7.1 and newer PHP versions.
 
-- In most cases, tests with `PCOV` execute much faster than with `Xdebug`.  
 - If your source code directory is other than `src`, `lib` or, `app`, specify `pcov.directory` using the `ini-values` input.  
 
 ```yaml
@@ -322,6 +330,7 @@ Disable coverage for these reasons:
 - It will remove `Xdebug`, which will have a positive impact on PHP performance.
 - You are using `phpdbg` for running your tests.
 - You are profiling your code using `blackfire`.
+- You are using PHP in JIT mode. Please refer to [JIT configuration](#jit-configuration) section for more details.
 
 ```yaml
 - name: Setup PHP with no coverage driver
@@ -610,20 +619,20 @@ jobs:
 
 Run the workflow locally with `act` using [`shivammathur/node`](https://github.com/shivammathur/node-docker "Docker image to run setup-php") docker images.
 
-Choose the image tag which matches the `runs-on` property in your workflow:
+Choose the image tag which matches the `runs-on` property in your workflow. For example, if you are using `ubuntu-20.04` in your workflow, run `act -P ubuntu-20.04=shivammathur/node:20.04`.
 
 ```bash
 # For runs-on: ubuntu-latest
 act -P ubuntu-latest=shivammathur/node:latest
 
 # For runs-on: ubuntu-20.04
-act -P ubuntu-20.04=shivammathur/node:focal
+act -P ubuntu-20.04=shivammathur/node:2004
 
 # For runs-on: ubuntu-18.04
-act -P ubuntu-18.04=shivammathur/node:bionic
+act -P ubuntu-18.04=shivammathur/node:1804
 
-# For runs-on: ubuntu-16.04
+# For runs-on: ubuntu-16.04 (deprecated)
-act -P ubuntu-16.04=shivammathur/node:xenial
+act -P ubuntu-16.04=shivammathur/node:1604
 ```
 
 ### JIT Configuration
@@ -631,6 +640,7 @@ act -P ubuntu-16.04=shivammathur/node:xenial
 > Enable Just-in-time(JIT) on PHP 8.0 and PHP 8.1.
 
 - To enable JIT, enable `opcache` in cli mode by setting `opcache.enable_cli=1`.
+- JIT conflicts with `Xdebug`, `PCOV`, and any other extension which overrides `zend_execute_ex` function, so set `coverage: none` and remove those extensions if added.
 - By default, `opcache.jit=1235` and `opcache.jit_buffer_size=256M` are set which can be changed using `ini-values` input.
 - For detailed information about JIT related directives refer to the [`official PHP documentation`](https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.jit "opcache.jit documentation").
 
@@ -641,6 +651,7 @@ For example to enable JIT in `tracing` mode with buffer size of `64 MB`.
   uses: shivammathur/setup-php@v2
   with:
     php-version: '8.0'
+    coverage: none
     ini-values: opcache.enable_cli=1, opcache.jit=tracing, opcache.jit_buffer_size=64M
 ```
 
@@ -816,9 +827,9 @@ Examples of using `setup-php` with various PHP Frameworks and Packages.
 
 ## :bookmark: Versioning
 
-- Use the `v2` tag as `setup-php` version. It is a rolling tag and is synced with the latest minor and patch releases. With `v2` you automatically get the bug fixes, new features and support for latest PHP releases. For debugging any issues `verbose` tag can be used temporarily. It outputs all the logs and is also synced with the latest releases.
+- Use the `v2` tag as `setup-php` version. It is a rolling tag and is synced with the latest minor and patch releases. With `v2` you automatically get the bug fixes, security patches, new features and support for latest PHP releases. For debugging any issues `verbose` tag can be used temporarily. It outputs all the logs and is also synced with the latest releases.
 - Semantic release versions can also be used. It is recommended to [use dependabot](https://docs.github.com/en/github/administering-a-repository/keeping-your-actions-up-to-date-with-github-dependabot "Setup Dependabot with GitHub Actions") with semantic versioning to keep the actions in your workflows up to date.
-- Commit SHA can also be used, but are not recommended. They have to be updated with every release manually, without which you will not get any bug fixes or new features. 
+- Commit SHA can also be used, but are not recommended. They have to be updated with every release manually, without which you will not get any bug fixes, security patches or new features. 
 - It is highly discouraged to use the `master` branch as version, it might break your workflow after major releases as they have breaking changes.
 - If you are using the `v1` tag or a `1.x.y` version, you should [switch to v2](https://github.com/shivammathur/setup-php/wiki/Switch-to-v2 "Guide for switching from setup-php v1 to v2") as `v1` only gets critical bug fixes. Maintenance support for `v1` will be dropped with the last `PHP 8.0` release.
 
@@ -835,24 +846,24 @@ Examples of using `setup-php` with various PHP Frameworks and Packages.
 - See [Contributor's Guide](.github/CONTRIBUTING.md "shivammathur/setup-php contribution guide") before you start.
 - If you face any issues or want to suggest a feature/improvement, start a discussion [here](https://github.com/shivammathur/setup-php/discussions "Setup PHP discussions").
 
-*Join the list of setup-php contributors*
+*Contributors of `setup-php` and other related projects*
 
 <p align="center">
   <a href="https://github.com/shivammathur/setup-php/graphs/contributors">
-    <img src="https://opencollective.com/setup-php/contributors.svg?width=1024&button=false" alt="setup-php contributors" width="100%">
+    <img src="https://setup-php.com/contributors/?" alt="Contributors of setup-php and related projects" width="100%">
   </a>
 </p>
 
 ## :sparkling_heart: Support This Project
 
-- If setup-php saved your developer time, please consider sponsoring setup-php:
+- This project is provided as Free and Open-Source software. We need funds to maintain and do future improvements. Please sponsor setup-php using the below options:
   - [Open Collective](https://opencollective.com/setup-php "setup-php Open Collective")
   - [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal")
   - [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon")
-- Please [reach out](mailto:contact@setup-php.com) if you have any questions regarding sponsoring setup-php.
+- Please [reach out](mailto:contact@setup-php.com) if you have any questions about sponsoring setup-php.
 - Please star the project and share it. If you blog, please share your experience of using this action.
 
-*Huge thanks to the following companies for supporting `setup-php`*
+*`setup-php` is generously supported by*
 
 <p>
   <a href="https://www.jetbrains.com/?from=setup-php">

__tests__/extensions.test.ts

@@ -154,25 +154,31 @@ describe('Extension tests', () => {
       'linux'
     );
     expect(linux).toContain(
-      'add_extension_from_github mongodb mongodb mongo-php-driver master'
+      'add_extension_from_source mongodb https://github.com mongodb mongo-php-driver master extension'
     );
   });
 
   it('checking addExtensionOnDarwin', async () => {
     let darwin: string = await extensions.addExtension(
-      'amqp, Xdebug, pcov, grpc, igbinary, imagick, imap, msgpack, protobuf, redis, swoole, sqlite, oci8, pdo_oci, :intl, ast-beta, grpc-1.2.3',
+      'amqp, apcu, Xdebug, pcov, grpc, igbinary, imagick, imap, memcache, memcached, msgpack, phalcon3, phalcon4, protobuf, psr, redis, swoole, sqlite, oci8, pdo_oci, :intl, ast-beta, grpc-1.2.3',
       '7.2',
       'darwin'
     );
     expect(darwin).toContain('add_brew_extension amqp extension');
+    expect(darwin).toContain('add_brew_extension apcu extension');
     expect(darwin).toContain('add_brew_extension xdebug zend_extension');
     expect(darwin).toContain('add_brew_extension pcov extension');
     expect(darwin).toContain('add_brew_extension grpc extension');
     expect(darwin).toContain('add_brew_extension igbinary extension');
     expect(darwin).toContain('add_brew_extension imagick extension');
     expect(darwin).toContain('add_brew_extension imap extension');
+    expect(darwin).toContain('add_brew_extension memcache extension');
+    expect(darwin).toContain('add_brew_extension memcached extension');
     expect(darwin).toContain('add_brew_extension msgpack extension');
+    expect(darwin).toContain('add_brew_extension phalcon3 extension');
+    expect(darwin).toContain('add_brew_extension phalcon4 extension');
     expect(darwin).toContain('add_brew_extension protobuf extension');
+    expect(darwin).toContain('add_brew_extension psr extension');
     expect(darwin).toContain('add_brew_extension redis extension');
     expect(darwin).toContain('add_brew_extension swoole extension');
     expect(darwin).toContain('add_extension sqlite3');
@@ -180,12 +186,6 @@ describe('Extension tests', () => {
     expect(darwin).toContain('add_unstable_extension ast beta extension');
     expect(darwin).toContain('add_pecl_extension grpc 1.2.3 extension');
 
-    darwin = await extensions.addExtension('phalcon3', '7.0', 'darwin');
-    expect(darwin).toContain('add_phalcon phalcon3');
-
-    darwin = await extensions.addExtension('phalcon4', '7.3', 'darwin');
-    expect(darwin).toContain('add_phalcon phalcon4');
-
     darwin = await extensions.addExtension('couchbase', '5.6', 'darwin');
     expect(darwin).toContain('add_couchbase');
 
@@ -254,7 +254,7 @@ describe('Extension tests', () => {
       'darwin'
     );
     expect(darwin).toContain(
-      'add_extension_from_github mongodb mongodb mongo-php-driver master'
+      'add_extension_from_source mongodb https://github.com mongodb mongo-php-driver master extension'
     );
   });
 });

__tests__/install.test.ts

@@ -5,7 +5,9 @@ import * as utils from '../src/utils';
  * Mock install.ts
  */
 jest.mock('../src/install', () => ({
-  getScript: jest.fn().mockImplementation(
+  getScript: jest
+    .fn()
+    .mockImplementation(
       async (
         filename: string,
         version: string,
@@ -37,8 +39,7 @@ jest.mock('../src/install', () => ({
         return script;
       }
     ),
-  run: jest.fn().mockImplementation(
+  run: jest.fn().mockImplementation(async (): Promise<string> => {
-    async (): Promise<string> => {
     const os_version: string = process.env['RUNNER_OS'] || '';
     const version: string = await utils.parseVersion(
       await utils.getInput('php-version', true)
@@ -52,8 +53,7 @@ jest.mock('../src/install', () => ({
       version,
       __dirname
     ].join(' ');
-    }
+  })
-  )
 }));
 
 /**

__tests__/tools.test.ts

@@ -16,7 +16,7 @@ describe('Tools tests', () => {
     expect(await tools.getToolVersion('1.2.3-alpha.1')).toBe('1.2.3-alpha.1');
   });
 
-  it('checking parseToolVersion', async () => {
+  it('checking parseTool', async () => {
     expect(await tools.parseTool('phpunit')).toStrictEqual({
       name: 'phpunit',
       version: 'latest'
@@ -65,6 +65,10 @@ describe('Tools tests', () => {
       name: 'phpunit',
       version: '1.2.3-alpha.1'
     });
+    expect(await tools.parseTool('phpunit/phpunit:^1.2.3')).toStrictEqual({
+      name: 'phpunit/phpunit',
+      version: '^1.2.3'
+    });
   });
 
   it('checking getUri', async () => {
@@ -148,9 +152,9 @@ describe('Tools tests', () => {
       'a',
       'b'
     ]);
-    expect(
+    expect(await tools.addComposer(['a', 'b', 'composer:1.2.3'])).toStrictEqual(
-      await tools.addComposer(['a', 'b', 'composer:1.2.3'])
+      ['composer:1.2.3', 'a', 'b']
-    ).toStrictEqual(['composer:1.2.3', 'a', 'b']);
+    );
     expect(
       await tools.addComposer(['a', 'b', 'composer:v1.2.3'])
     ).toStrictEqual(['composer:1.2.3', 'a', 'b']);
@@ -234,22 +238,6 @@ describe('Tools tests', () => {
     );
   });
 
-  it('checking getCleanedToolsList', async () => {
-    const tools_list: string[] = await tools.getCleanedToolsList(
-      'tool, composer:1.2, behat/behat, icanhazstring/composer-unused, laravel/vapor-cli, robmorgan/phinx, phpspec/phpspec, symfony/flex'
-    );
-    expect(tools_list).toStrictEqual([
-      'composer',
-      'tool',
-      'behat',
-      'composer-unused',
-      'vapor-cli',
-      'phinx',
-      'phpspec',
-      'flex'
-    ]);
-  });
-
   it('checking getWpCliUri', async () => {
     expect(await tools.getWpCliUrl('latest')).toBe(
       'wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true'
@@ -548,9 +536,11 @@ describe('Tools tests', () => {
     const listOfTools = [
       'composer:v1',
       'codeception/codeception',
+      'prestissimo',
       'hirak/prestissimo',
+      'composer-prefetcher',
       'narrowspark/automatic-composer-prefetcher',
-      'robmorgan/phinx'
+      'robmorgan/phinx: ^1.2'
     ];
 
     const script: string = await tools.addTools(
@@ -563,9 +553,9 @@ describe('Tools tests', () => {
       'Add-Tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-1.phar,https://getcomposer.org/composer-1.phar composer'
     );
     expect(script).toContain('Add-Composertool prestissimo prestissimo hirak/');
-    expect(script).toContain('Add-Composertool phinx phinx robmorgan/');
+    expect(script).toContain('Add-Composertool phinx phinx:^1.2 robmorgan/');
     expect(script).toContain(
-      'Add-Composertool composer-prefetcher composer-prefetcher narrowspark/automatic-'
+      'Add-Composertool automatic-composer-prefetcher automatic-composer-prefetcher narrowspark/'
     );
   });
   it('checking composer setup', async () => {
@@ -593,5 +583,15 @@ describe('Tools tests', () => {
     expect(script).toContain(
       'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-snapshot.phar,https://getcomposer.org/composer.phar composer snapshot'
     );
+
+    script = await tools.addTools('none', '7.4', 'linux');
+    expect(script).toStrictEqual('');
+
+    script = await tools.addTools('none, phpunit', '7.4', 'linux');
+    expect(script).toStrictEqual(
+      '\nstep_log "Setup Tools"' +
+        '\nadd_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-stable.phar,https://getcomposer.org/composer-stable.phar composer latest\n' +
+        '\nadd_tool https://phar.phpunit.de/phpunit.phar phpunit "--version"'
+    );
   });
 });

__tests__/utils.test.ts

@@ -8,11 +8,9 @@ jest.mock('@actions/core', () => ({
   })
 }));
 
-jest.spyOn(utils, 'fetch').mockImplementation(
+jest.spyOn(utils, 'fetch').mockImplementation(async (url): Promise<string> => {
-  async (url): Promise<string> => {
   return `{ "latest": "8.0", "5.x": "5.6", "url": "${url}" }`;
-  }
+});
-);
 
 async function cleanup(path: string): Promise<void> {
   fs.unlink(path, error => {
@@ -259,4 +257,31 @@ describe('Utils tests', () => {
       await utils.customPackage('pkg8', 'ext', '1.2.3', 'linux')
     ).toContain(script_path + '\nadd_pkg 1.2.3');
   });
+
+  it('checking parseExtensionSource', async () => {
+    expect(
+      await utils.parseExtensionSource(
+        'ext-org-name/repo-name@release',
+        'extension'
+      )
+    ).toContain(
+      '\nadd_extension_from_source ext https://github.com org-name repo-name release extension'
+    );
+    expect(
+      await utils.parseExtensionSource(
+        'ext-https://sub.domain.tld/org/repo@release',
+        'extension'
+      )
+    ).toContain(
+      '\nadd_extension_from_source ext https://sub.domain.tld org repo release extension'
+    );
+    expect(
+      await utils.parseExtensionSource(
+        'ext-https://sub.domain.XN--tld/org/repo@release',
+        'extension'
+      )
+    ).toContain(
+      '\nadd_extension_from_source ext https://sub.domain.XN--tld org repo release extension'
+    );
+  });
 });

package.json

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

src/extensions.ts

@@ -17,26 +17,28 @@ export async function addExtensionDarwin(
     const version_extension: string = version + extension;
     const [ext_name, ext_version]: string[] = extension.split('-');
     const ext_prefix = await utils.getExtensionPrefix(ext_name);
-    let matches: RegExpExecArray;
 
     switch (true) {
       // match :extension
       case /^:/.test(ext_name):
         remove_script += '\nremove_extension ' + ext_name.slice(1);
         return;
+      // match extensions for compiling from source
+      case /.+-.+\/.+@.+/.test(extension):
+        add_script += await utils.parseExtensionSource(extension, ext_prefix);
+        return;
       // match 5.3blackfire...8.0blackfire
       // match 5.3blackfire-(semver)...8.0blackfire-(semver)
-      // match couchbase, pdo_oci, oci8, http, pecl_http
+      // match couchbase, geos, pdo_oci, oci8, http, pecl_http
-      // match 5.3ioncube...7.4ioncube, 5.3geos...7.4geos
+      // match 5.3ioncube...7.4ioncube
       // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
       case /^(5\.[3-6]|7\.[0-4]|8\.0)blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
-      case /^couchbase$|^pdo_oci$|^oci8$|^http|^pecl_http|^pdo_firebird$/.test(
+      case /^couchbase$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
         extension
       ):
-      case /^(5\.[3-6]|7\.[0-4])(ioncube|geos)$/.test(version_extension):
+      case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
-      case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
         add_script += await utils.customPackage(
           ext_name,
           'ext',
@@ -53,19 +55,6 @@ export async function addExtensionDarwin(
           ext_prefix
         );
         return;
-      // match extensions from GitHub. Do this before checking for semver as
-      // the version may match that as well
-      case /.+-.+\/.+@.+/.test(extension):
-        matches = /.+-(.+)\/(.+)@(.+)/.exec(extension) as RegExpExecArray;
-        add_script += await utils.joins(
-          '\nadd_extension_from_github',
-          ext_name,
-          matches[1],
-          matches[2],
-          matches[3],
-          ext_prefix
-        );
-        return;
       // match semver
       case /.+-\d+\.\d+\.\d+.*/.test(extension):
         add_script += await utils.joins(
@@ -79,14 +68,15 @@ export async function addExtensionDarwin(
       case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
         add_script += await utils.getUnsupportedLog('pcov', version, 'darwin');
         return;
-      // match 5.6 to 8.9 for amqp, grpc, igbinary, imagick, imap, msgpack, protobuf, raphf, redis, swoole, xdebug, xdebug2, zmq
+      // match 5.6 and newer - amqp, apcu, grpc, igbinary, imagick, imap, msgpack, protobuf, raphf, redis, swoole, xdebug, xdebug2, zmq
-      // match 7.1 to 8.9 for pcov
+      // match 7.1 and newer - pcov
-      // match 5.6 to 7.4 for propro
+      // match 5.6 to 7.4 - propro
-      case /(5\.6|7\.[0-4]|8\.[0-9])(amqp|grpc|igbinary|imagick|imap|msgpack|protobuf|raphf|redis|swoole|xdebug|xdebug2|zmq)/.test(
+      case /(?<!5\.[3-5])(amqp|apcu|grpc|igbinary|imagick|imap|memcache|memcached|msgpack|protobuf|psr|raphf|redis|swoole|xdebug|xdebug2|zmq)/.test(
         version_extension
       ):
       case /(5\.6|7\.[0-4])propro/.test(version_extension):
-      case /(7\.[1-4]|8\.[0-9])pcov/.test(version_extension):
+      case /(?<!5\.[3-6]|7\.0)pcov/.test(version_extension):
+      case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4/.test(version_extension):
         add_script += await utils.joins(
           '\nadd_brew_extension',
           ext_name,
@@ -137,9 +127,9 @@ export async function addExtensionWindows(
         version_extension
       ):
       case /^pdo_oci$|^oci8$|^pdo_firebird$/.test(extension):
-      case /^5\.[3-6]ioncube$|^7\.[0-4]ioncube$/.test(version_extension):
+      case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
       case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-      case /^(7\.[1-4]|8\.0)(http|pecl_http)$/.test(version_extension):
+      case /^(7\.[1-4]|8\.0)(pecl_)?http/.test(version_extension):
         add_script += await utils.customPackage(
           ext_name,
           'ext',
@@ -155,8 +145,7 @@ export async function addExtensionWindows(
           ext_version.replace('stable', '')
         );
         break;
-      // match extensions from GitHub. Do this before checking for semver as
+      // match extensions for compiling from source
-      // the version may match that as well
       case /.+-.+\/.+@.+/.test(extension):
         add_script += await utils.getUnsupportedLog(
           extension,
@@ -193,17 +182,15 @@ export async function addExtensionWindows(
       case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
         add_script += await utils.getUnsupportedLog('pcov', version, 'win32');
         break;
-      // match 5.3mysql..5.6mysql
+      // match 5.3 to 5.6 - mysql, mysqli, mysqlnd
-      // match 5.3mysqli..5.6mysqli
+      case /^5\.[3-6](?<!pdo_)(mysql|mysqli|mysqlnd)$/.test(version_extension):
-      // match 5.3mysqlnd..5.6mysqlnd
-      case /^5\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
         add_script +=
           '\nAdd-Extension mysql\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
         break;
-      // match 7.0mysql..8.9mysql
+      // match 7.0 and newer mysql, mysqli and mysqlnd
-      // match 7.0mysqli..8.9mysqli
+      case /(?<!5\.[3-6])(?<!pdo_)(mysql|mysqli|mysqlnd)$/.test(
-      // match 7.0mysqlnd..8.9mysqlnd
+        version_extension
-      case /[7-8]\.\d+(mysql|mysqli|mysqlnd)$/.test(version_extension):
+      ):
         add_script += '\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
         break;
       // match sqlite
@@ -236,33 +223,34 @@ export async function addExtensionLinux(
     const version_extension: string = version + extension;
     const [ext_name, ext_version]: string[] = extension.split('-');
     const ext_prefix = await utils.getExtensionPrefix(ext_name);
-    let matches: RegExpExecArray;
 
     switch (true) {
       // Match :extension
       case /^:/.test(ext_name):
         remove_script += '\nremove_extension ' + ext_name.slice(1);
         return;
+      // match extensions for compiling from source
+      case /.+-.+\/.+@.+/.test(extension):
+        add_script += await utils.parseExtensionSource(extension, ext_prefix);
+        return;
       // match 5.3blackfire...8.0blackfire
       // match 5.3blackfire-(semver)...8.0blackfire-(semver)
       // match 5.3pdo_cubrid...7.2php_cubrid, 5.3cubrid...7.4cubrid
-      // match couchbase, pdo_oci, oci8, http, pecl_http
+      // match couchbase, geos, pdo_oci, oci8, http, pecl_http
-      // match 5.3ioncube...7.4ioncube, 5.3geos...7.4geos
+      // match 5.3ioncube...7.4ioncube
       // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
-      // match 5.6gearman...7.4gearman
       case /^(5\.[3-6]|7\.[0-4]|8\.0)blackfire(-\d+\.\d+\.\d+)?$/.test(
         version_extension
       ):
       case /^((5\.[3-6])|(7\.[0-2]))pdo_cubrid$|^((5\.[3-6])|(7\.[0-4]))cubrid$/.test(
         version_extension
       ):
-      case /^couchbase$|^pdo_oci$|^oci8$|^http|^pecl_http|^pdo_firebird$/.test(
+      case /^couchbase$|^gearman$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
         extension
       ):
       case /(?<!5\.[3-5])intl-[\d]+\.[\d]+$/.test(version_extension):
-      case /^(5\.[3-6]|7\.[0-4])(ioncube|geos)$/.test(version_extension):
+      case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
       case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-      case /^((5\.6)|(7\.[0-4]))gearman$/.test(version_extension):
         add_script += await utils.customPackage(
           ext_name,
           'ext',
@@ -279,19 +267,6 @@ export async function addExtensionLinux(
           ext_prefix
         );
         return;
-      // match extensions from GitHub. Do this before checking for semver as
-      // the version may match that as well
-      case /.+-.+\/.+@.+/.test(extension):
-        matches = /.+-(.+)\/(.+)@(.+)/.exec(extension) as RegExpExecArray;
-        add_script += await utils.joins(
-          '\nadd_extension_from_github',
-          ext_name,
-          matches[1],
-          matches[2],
-          matches[3],
-          ext_prefix
-        );
-        return;
       // match semver versions
       case /.+-\d+\.\d+\.\d+.*/.test(extension):
         add_script += await utils.joins(

src/install.ts

@@ -1,4 +1,4 @@
-import {exec} from '@actions/exec/lib/exec';
+import {exec} from '@actions/exec';
 import * as core from '@actions/core';
 import * as config from './config';
 import * as coverage from './coverage';
@@ -51,6 +51,11 @@ export async function getScript(
  */
 export async function run(): Promise<void> {
   try {
+    if ((await utils.readEnv('ImageOS')) == 'ubuntu16') {
+      core.warning(
+        'Ubuntu 16.04 is deprecated.\nPlease upgrade to Ubuntu 18.04 or Ubuntu 20.04 - https://setup-php.com/i/452'
+      );
+    }
     const version: string = await utils.parseVersion(
       await utils.getInput('php-version', true)
     );
@@ -69,4 +74,8 @@ export async function run(): Promise<void> {
 }
 
 // call the run function
-run();
+(async () => {
+  await run();
+})().catch(error => {
+  core.setFailed(error.message);
+});

src/scripts/common.sh

@@ -29,18 +29,15 @@ add_log() {
     printf "\033[32;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
   else
     printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
-    [ "$fail_fast" = "true" ] && exit 1;
+    [ "$fail_fast" = "true" ] && exit 1
   fi
 }
 
 # Function to log result of installing extension.
 add_extension_log() {
-  extension=$1
-  status=$2
-  extension_name=$(echo "$extension" | cut -d '-' -f 1)
   (
-    check_extension "$extension_name" && add_log "$tick" "$extension_name" "$status"
+    check_extension "$(echo "$1" | cut -d '-' -f 1)" && add_log "$tick" "$1" "$2"
-  ) || add_log "$cross" "$extension_name" "Could not install $extension on PHP ${semver:?}"
+  ) || add_log "$cross" "$1" "Could not install $1 on PHP ${semver:?}"
 }
 
 # Function to read env inputs.
@@ -85,6 +82,10 @@ run_script() {
 # Function to install required packages on self-hosted runners.
 self_hosted_setup() {
   if [ "$runner" = "self-hosted" ]; then
+    if [ "$DISTRIB_RELEASE" = "16.04" ] && [ "$CONTAINER" != "shivammathur/node" ]; then
+      add_log "$cross" "Ubuntu" "Ubuntu 16.04 (Xenial Xerus) is no longer supported on self-hosted runner"
+      exit 1
+    fi
     if [[ "${version:?}" =~ $old_versions ]]; then
       add_log "$cross" "PHP" "PHP $version is not supported on self-hosted runner"
       exit 1
@@ -126,9 +127,8 @@ enable_cache_extension() {
 
 # Function to enable existing extensions.
 enable_extension() {
-  if [ -e /tmp/setup_php_dismod ] && grep -q "$1" /tmp/setup_php_dismod; then
+  modules_dir="/var/lib/php/modules/$version"
-    sudo phpenmod -v "$version" "$1" >/dev/null 2>&1
+  [ -d "$modules_dir" ] && sudo find "$modules_dir" -path "*disabled*$1" -delete
-  fi
   if [ -d /tmp/extcache/"$1" ]; then
     enable_cache_extension "$1" "$2"
   elif ! check_extension "$1" && [ -e "${ext_dir:?}/$1.so" ]; then
@@ -148,9 +148,6 @@ configure_php() {
 # Function to configure PECL.
 configure_pecl() {
   if ! [ -e /tmp/pecl_config ]; then
-    if ! command -v pecl >/dev/null || ! command -v pear >/dev/null; then
-      add_pecl >/dev/null 2>&1
-    fi
     for script in pear pecl; do
       sudo "$script" config-set php_ini "${pecl_file:-${ini_file[@]}}"
       sudo "$script" channel-update "$script".php.net
@@ -175,10 +172,30 @@ get_pecl_version() {
 # Function to install PECL extensions and accept default options
 pecl_install() {
   local extension=$1
-  configure_pecl >/dev/null 2>&1
+  add_pecl >/dev/null 2>&1
   yes '' 2>/dev/null | sudo pecl install -f "$extension" >/dev/null 2>&1
 }
 
+# Function to install a specific version of PECL extension.
+add_pecl_extension() {
+  extension=$1
+  pecl_version=$2
+  prefix=$3
+  enable_extension "$extension" "$prefix"
+  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot|preview).* ]]; then
+    pecl_version=$(get_pecl_version "$extension" "$pecl_version")
+  fi
+  ext_version=$(php -r "echo phpversion('$extension');")
+  if [ "$ext_version" = "$pecl_version" ]; then
+    add_log "${tick:?}" "$extension" "Enabled"
+  else
+    disable_extension "$extension" >/dev/null 2>&1
+    delete_extension "$extension" >/dev/null 2>&1
+    pecl_install "$extension-$pecl_version"
+    add_extension_log "$extension-$pecl_version" "Installed and enabled"
+  fi
+}
+
 # Function to setup pre-release extensions using PECL.
 add_unstable_extension() {
   extension=$1
@@ -192,7 +209,8 @@ add_unstable_extension() {
 get_tool_version() {
   tool=$1
   param=$2
-  version_regex="[0-9]+((\.{1}[0-9]+)+)(\.{0})(-[a-zA-Z0-9]+){0,1}"
+  alp="[a-zA-Z0-9]"
+  version_regex="[0-9]+((\.{1}$alp+)+)(\.{0})(-$alp+){0,1}"
   if [ "$tool" = "composer" ]; then
     if [ "$param" != "snapshot" ]; then
       composer_version="$(grep -Ea "const\sVERSION" "$tool_path_dir/composer" | grep -Eo "$version_regex")"
@@ -269,9 +287,9 @@ add_composertool() {
   fi
   (
     sudo rm -f "$composer_lock" >/dev/null 2>&1 || true
-    composer global require "$prefix$release" >/dev/null 2>&1
+    composer global require "$prefix$release" 2>&1 | tee /tmp/composer.log >/dev/null 2>&1
-    json=$(grep "$prefix$tool" "$composer_json") &&
+    log=$(grep "$prefix$tool" /tmp/composer.log) &&
-    tool_version=$(get_tool_version 'echo' "$json") &&
+      tool_version=$(get_tool_version 'echo' "$log") &&
       add_log "$tick" "$tool" "Added $tool $tool_version"
   ) || add_log "$cross" "$tool" "Could not setup $tool"
   add_tools_helper "$tool"
@@ -293,23 +311,3 @@ php_src_tag() {
   fi
   echo "$php_src_tag"
 }
-
-# Function to install extension from a GitHub repository
-add_extension_from_github() {
-  extension=$1
-  org=$2
-  repo=$3
-  release=$4
-  prefix=$5
-  (
-    add_devtools phpize
-    delete_extension "$extension"
-    git clone -n https://github.com/"$org"/"$repo" /tmp/"$repo-$release" || exit 1
-    cd /tmp/"$repo-$release" || exit 1
-    git checkout "$release" || exit 1
-    git submodule update --init --recursive || exit 1
-    phpize && ./configure && make -j"$(nproc)" && sudo make install
-    enable_extension "$extension" "$prefix"
-  ) >/dev/null 2>&1
-  add_extension_log "$extension-$org/$repo@$release" "Installed and enabled"
-}

src/scripts/darwin.sh

@@ -7,12 +7,24 @@ self_hosted_helper() {
   fi
 }
 
+# Function to delete extension.
+delete_extension() {
+  extension=$1
+  sudo rm -rf "${scan_dir:?}"/*"$extension"* "${ext_dir:?}"/"$extension".so >/dev/null 2>&1
+}
+
+# Function to disable extension.
+disable_extension() {
+  extension=$1
+  sudo sed -Ei '' "/=(.*\/)?\"?$extension(.so)?$/d" "${ini_file:?}"
+}
+
 # Function to remove extensions.
 remove_extension() {
   extension=$1
   if check_extension "$extension"; then
-    sudo sed -Ei '' "/=(.*\/)?\"?$extension(.so)?$/d" "${ini_file:?}"
+    disable_extension "$extension"
-    sudo rm -rf "${scan_dir:?}"/*"$extension"* "${ext_dir:?}"/"$extension".so >/dev/null 2>&1
+    delete_extension "$extension"
     (! check_extension "$extension" && add_log "${tick:?}" ":$extension" "Removed") ||
       add_log "${cross:?}" ":$extension" "Could not remove $extension on PHP ${semver:?}"
   else
@@ -20,26 +32,7 @@ remove_extension() {
   fi
 }
 
-# Function to install a specific version of PECL extension.
+# Function to fetch a brew tap.
-add_pecl_extension() {
-  extension=$1
-  pecl_version=$2
-  prefix=$3
-  enable_extension "$extension" "$prefix"
-  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot|preview).* ]]; then
-    pecl_version=$(get_pecl_version "$extension" "$pecl_version")
-  fi
-  ext_version=$(php -r "echo phpversion('$extension');")
-  if [ "$ext_version" = "$pecl_version" ]; then
-    add_log "${tick:?}" "$extension" "Enabled"
-  else
-    remove_extension "$extension" >/dev/null 2>&1
-    pecl_install "$extension-$pecl_version"
-    add_extension_log "$extension-$pecl_version" "Installed and enabled"
-  fi
-}
-
-# Function to fetch a brew tap
 fetch_brew_tap() {
   tap=$1
   tap_user=$(dirname "$tap")
@@ -78,13 +71,14 @@ add_brew_extension() {
     add_brew_tap shivammathur/homebrew-php
     add_brew_tap shivammathur/homebrew-extensions
     sudo mv "$tap_dir"/shivammathur/homebrew-extensions/.github/deps/"$formula"/* "$tap_dir/homebrew/homebrew-core/Formula/" 2>/dev/null || true
+    update_dependencies >/dev/null 2>&1
     brew install -f "$formula@$version" >/dev/null 2>&1
     sudo cp "$brew_prefix/opt/$formula@$version/$extension.so" "$ext_dir"
     add_extension_log "$extension" "Installed and enabled"
   fi
 }
 
-# Function to setup extensions
+# Function to setup extensions.
 add_extension() {
   extension=$1
   prefix=$2
@@ -107,67 +101,106 @@ add_devtools() {
 
 # Function to handle request to add PECL.
 add_pecl() {
+  configure_pecl >/dev/null 2>&1
   pecl_version=$(get_tool_version "pecl" "version")
   add_log "${tick:?}" "PECL" "Found PECL $pecl_version"
 }
 
-# Function to link all libraries of a formula
+# Function to link all libraries of a formula.
 link_libraries() {
   formula=$1
   formula_prefix="$(brew --prefix "$formula")"
   sudo mkdir -p "$formula_prefix"/lib
   for lib in "$formula_prefix"/lib/*.dylib; do
     lib_name=$(basename "$lib")
-    sudo cp -a "$lib" "$brew_prefix/lib/old_$lib_name" 2>/dev/null || true
+    sudo cp -a "$lib" "$brew_prefix/lib/$lib_name" 2>/dev/null || true
-    sudo ln -sf "$brew_prefix"/lib/old_$lib_name "$brew_prefix/lib/$lib_name"
   done
 }
 
+# Patch brew to overwrite packages.
+patch_brew() {
+  formula_installer="$brew_repo"/Library/Homebrew/formula_installer.rb
+  code=" keg.link(verbose: verbose?"
+  sudo sed -i '' "s/$code)/$code, overwrite: true)/" "$formula_installer"
+  # shellcheck disable=SC2064
+  trap "sudo sed -i '' 's/$code, overwrite: true)/$code)/' $formula_installer" exit
+}
+
+# Helper function to update the dependencies.
 update_dependencies_helper() {
-  formula=$1
+  dependency=$1
-  get -q -n "$tap_dir/homebrew/homebrew-core/Formula/$formula.rb" "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/$formula.rb"
+  get -q -n "$tap_dir/homebrew/homebrew-core/Formula/$dependency.rb" "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/$dependency.rb"
-  link_libraries "$formula"
+  link_libraries "$dependency"
 }
 
 # Function to update dependencies.
 update_dependencies() {
-  if [ "${runner:?}" != "self-hosted" ] && [ "${ImageOS:-}" != "" ] && [ "${ImageVersion:-}" != "" ]; then
+  if ! [ -e /tmp/update_dependencies ] && [ "${runner:?}" != "self-hosted" ] && [ "${ImageOS:-}" != "" ] && [ "${ImageVersion:-}" != "" ]; then
-    while read -r formula; do
+    patch_brew
-      update_dependencies_helper "$formula" &
+    while read -r dependency; do
+      update_dependencies_helper "$dependency" &
       to_wait+=($!)
     done <"$tap_dir/shivammathur/homebrew-php/.github/deps/${ImageOS:?}_${ImageVersion:?}"
     wait "${to_wait[@]}"
+
+    # Remove when PCRE2 on macOS images is updated to PCRE2 10.37
+    brew reinstall pcre2 >/dev/null 2>&1
+
+    echo '' | sudo tee /tmp/update_dependencies >/dev/null 2>&1
+  fi
+}
+
+# Function to fix dependencies on install PHP version.
+fix_dependencies() {
+  broken_deps_paths=$(php -v 2>&1 | grep -Eo '/opt/[a-zA-Z0-9@\.]+')
+  if [ "x$broken_deps_paths" != "x" ]; then
+    update_dependencies
+    IFS=" " read -r -a formulae <<< "$(echo "$broken_deps_paths" | tr '\n' ' ' | sed 's|/opt/||g' 2>&1)$php_formula"
+    brew reinstall "${formulae[@]}"
+    brew link --force --overwrite "$php_formula" || true
+  fi
+}
+
+# Function to get PHP version if it is already installed using Homebrew.
+get_brewed_php() {
+  php_cellar="$brew_prefix"/Cellar/php
+  if [ -d "$php_cellar" ] && ! [[ "$(find "$php_cellar" -maxdepth 1 -name "$version*" | wc -l 2>/dev/null)" -eq 0 ]]; then
+    php-config --version 2>/dev/null | cut -c 1-3
+  else
+    echo 'false';
   fi
 }
 
 # Function to setup PHP 5.6 and newer using Homebrew.
 add_php() {
   action=$1
+  existing_version=$2
   add_brew_tap shivammathur/homebrew-php
   update_dependencies
-  if ! [[ "$(find "$(brew --cellar)"/php/ -maxdepth 1 -name "$version*" | wc -l 2>/dev/null)" -eq 0 ]] && [ "$action" != "upgrade" ]; then
+  if [ "$existing_version" != "false" ]; then
-    brew unlink shivammathur/php/php@"$version"
+    ([ "$action" = "upgrade" ] && brew upgrade -f "$php_formula") || brew unlink "$php_formula"
   else
-    brew upgrade -f "shivammathur/php/php@$version" 2>/dev/null || brew install -f "shivammathur/php/php@$version"
+    brew install -f "$php_formula"
   fi
-  brew link --force --overwrite shivammathur/php/php@"$version"
+  brew link --force --overwrite "$php_formula"
 }
 
-# Function to Setup PHP
+# Function to Setup PHP.
 setup_php() {
   step_log "Setup PHP"
-  existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
+  existing_version=$(get_brewed_php)
   if [[ "$version" =~ ${old_versions:?} ]]; then
     run_script "php5-darwin" "${version/./}" >/dev/null 2>&1
     status="Installed"
   elif [ "$existing_version" != "$version" ]; then
-    add_php "install" >/dev/null 2>&1
+    add_php "install" "$existing_version" >/dev/null 2>&1
     status="Installed"
   elif [ "$existing_version" = "$version" ] && [ "${update:?}" = "true" ]; then
-    add_php "upgrade" >/dev/null 2>&1
+    add_php "upgrade" "$existing_version" >/dev/null 2>&1
     status="Updated to"
   else
     status="Found"
+    fix_dependencies >/dev/null 2>&1
   fi
   ini_file=$(php -d "date.timezone=UTC" --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
   sudo chmod 777 "$ini_file" "${tool_path_dir:?}"
@@ -187,6 +220,7 @@ setup_php() {
 # Variables
 version=$1
 dist=$2
+php_formula=shivammathur/php/php@"$version"
 brew_prefix="$(brew --prefix)"
 brew_repo="$(brew --repository)"
 tap_dir="$brew_repo"/Library/Taps
@@ -197,6 +231,7 @@ export HOMEBREW_NO_AUTO_UPDATE=1
 export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
 
 # shellcheck source=.
+. "${scripts:?}"/ext/source.sh
 . "${scripts:?}"/tools/add_tools.sh
 . "${scripts:?}"/common.sh
 read_env

src/scripts/ext/blackfire.ps1

@@ -10,8 +10,12 @@ Function Add-Blackfire() {
     $no_dot_version = $version.replace('.', '')
     $extension_version = $extension.split('-')[1]
     if ($extension_version -notmatch "\S") {
+        if($version -lt '7.0') {
+            $extension_version = '1.50.0'
+        } else {
             $extension_version = (Invoke-RestMethod https://blackfire.io/api/v1/releases).probe.php
         }
+    }
     if (Test-Path $ext_dir\blackfire.dll) {
         Enable-PhpExtension -Extension blackfire -Path $php_dir
         $status="Enabled"

src/scripts/ext/blackfire.sh

@@ -8,8 +8,12 @@ add_blackfire() {
   blackfire_ini_file="${pecl_file:-${ini_file[@]}}"
   if [ ! -e "${ext_dir:?}/blackfire.so" ]; then
     if [ "$extension_version" = "blackfire" ]; then
+      if [[ ${version:?} =~ 5.[3-6] ]]; then
+        extension_version='1.50.0'
+      else
         extension_version=$(get -s -n "" https://blackfire.io/api/v1/releases | grep -Eo 'php":"([0-9]+.[0-9]+.[0-9]+)' | cut -d '"' -f 3)
       fi
+    fi
     get -q -n "${ext_dir:?}/blackfire.so" https://packages.blackfire.io/binaries/blackfire-php/"$extension_version"/blackfire-php-"$platform"_amd64-php-"$no_dot_version".so >/dev/null 2>&1
   fi
   echo "extension=blackfire.so" | sudo tee -a "$blackfire_ini_file" >/dev/null 2>&1

src/scripts/ext/couchbase.sh

@@ -1,18 +1,17 @@
 # Function to install libraries required by couchbase
 add_couchbase_libs() {
   if [ "$(uname -s)" = "Linux" ]; then
+    trunk="https://github.com/couchbase/libcouchbase/releases"
     if [[ ${version:?} =~ 5.[3-6]|7.[0-1] ]]; then
-      trunk="http://packages.couchbase.com/ubuntu"
+      release="2.10.9"
-      list="deb $trunk ${DISTRIB_CODENAME:?} ${DISTRIB_CODENAME:?}/main"
     else
-      trunk="http://packages.couchbase.com/clients/c/repos/deb"
+      release="$(curl -sL $trunk/latest | grep -Eo "libcouchbase-[0-9]+\.[0-9]+\.[0-9]+" | head -n 1 | cut -d'-' -f 2)"
-      list="deb $trunk/ubuntu${DISTRIB_RELEASE/./} ${DISTRIB_CODENAME:?} ${DISTRIB_CODENAME:?}/main"
     fi
-    add_pecl
+    deb_url="$trunk/download/$release/libcouchbase-${release}_ubuntu${DISTRIB_RELEASE/./}_${DISTRIB_CODENAME}_amd64.tar"
-    get -s -n "" "$trunk/couchbase.key" | sudo apt-key add
+    get -q -n /tmp/libcouchbase.tar "$deb_url"
-    echo "$list" | sudo tee /etc/apt/sources.list.d/couchbase.list
+    sudo tar -xf /tmp/libcouchbase.tar -C /tmp
-    sudo apt-get update
+    install_packages libev4 libevent-dev
-    ${apt_install:?} libcouchbase-dev
+    sudo dpkg -i /tmp/libcouchbase-*/*.deb
   else
     if [[ ${version:?} =~ 5.[3-6]|7.[0-1] ]]; then
       brew install libcouchbase@2

src/scripts/ext/cubrid.sh

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

src/scripts/ext/firebird.sh

@@ -10,18 +10,10 @@ add_firebird_client_darwin() {
 add_firebird_helper() {
   firebird_dir=$1
   tag="$(php_src_tag)"
-  get -s -n "" https://github.com/php/php-src/archive/"$tag".tar.gz | tar -xzf - -C /tmp
+  export PDO_FIREBIRD_CONFIGURE_OPTS="--with-pdo-firebird=$firebird_dir"
-  (
+  export PDO_FIREBIRD_LINUX_LIBS="firebird-dev"
-    cd /tmp/php-src-"$tag"/ext/pdo_firebird || exit
+  export PDO_FIREBIRD_PATH="ext/pdo_firebird"
-    if [[ "${version:?}" =~ ${old_versions:?} ]]; then
+  add_extension_from_source pdo_firebird https://github.com php php-src "$tag" extension get
-      sudo sed -i '' '/PHP_CHECK_PDO_INCLUDES/d' config.m4 2>/dev/null || sudo sed -i '/PHP_CHECK_PDO_INCLUDES/d' config.m4
-    fi
-    sudo phpize
-    sudo ./configure --with-pdo-firebird="$firebird_dir"
-    sudo make -j"$(nproc 2>/dev/null || sysctl -n hw.ncpu)"
-    sudo make install
-    enable_extension pdo_firebird extension
-  )
 }
 
 add_firebird() {
@@ -29,10 +21,6 @@ add_firebird() {
   if ! check_extension pdo_firebird; then
     if [ "$(uname -s)" = "Linux" ]; then
       if [[ "${version:?}" =~ 5.3|${nightly_versions:?} ]]; then
-        lib_arch=$(gcc -dumpmachine)
-        install_packages firebird-dev >/dev/null 2>&1
-        sudo ln -sf /usr/lib/"$lib_arch"/libfbclient.so.2 /usr/lib/libfbclient.so >/dev/null 2>&1
-        sudo ln -sf /usr/lib/"$lib_arch"/libib_util.so /usr/lib/ >/dev/null 2>&1
         add_firebird_helper /usr >/dev/null 2>&1
       else
         add_pdo_extension firebird >/dev/null 2>&1

src/scripts/ext/gearman.sh

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

src/scripts/ext/geos.sh

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

src/scripts/ext/http.sh

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

src/scripts/ext/oci.sh

@@ -9,8 +9,8 @@ add_license_log() {
 
 # Function to install instantclient and SDK.
 add_client() {
-  sudo mkdir -p -m 777 "$oracle_home"
   if [ ! -e "$oracle_client" ]; then
+    sudo mkdir -p -m 777 "$oracle_home" "$oracle_client"
     for package in basiclite sdk; do
       if [ "$os" = 'Linux' ]; then
         libs='/usr/lib/'
@@ -24,57 +24,12 @@ add_client() {
         lib_ext='dylib'
       fi
       get -q -n "/opt/oracle/$package.zip" "https://download.oracle.com/otn_software/$os_name/instantclient/instantclient-$package-$arch.zip"
-      unzip "/opt/oracle/$package.zip" -d "$oracle_home"
+      unzip -o "/opt/oracle/$package.zip" -d "$oracle_home"
     done
-    sudo ln -sf /opt/oracle/instantclient*/*.$lib_ext* $libs
+    for icdir in /opt/oracle/instantclient_*; do
-    sudo ln -sf /opt/oracle/instantclient* "$oracle_client"
+      sudo mv "$icdir"/* "$oracle_client"/
-  fi
+    done
-}
+    sudo ln -sf /opt/oracle/instantclient/*.$lib_ext* $libs
-
-# Function to get PHP source.
-get_php() {
-  [ ! -d "/opt/oracle/php-src-$tag" ] && get -s -n "" "https://github.com/php/php-src/archive/$tag.tar.gz" | tar xzf - -C "$oracle_home/"
-}
-
-# Function to get phpize location on darwin.
-get_phpize() {
-  if [[ "${version:?}" =~ 5.[3-5] ]]; then
-    echo '/opt/local/bin/phpize'
-  else
-    echo "/usr/local/bin/$(readlink /usr/local/bin/phpize)"
-  fi
-}
-
-# Function to patch phpize to link to php headers on darwin.
-patch_phpize() {
-  if [ "$os" = "Darwin" ]; then
-    sudo cp "$phpize_orig" "$phpize_orig.bck"
-    sudo sed -i '' 's~includedir=.*~includedir="$(xcrun --show-sdk-path)/usr/include/php"~g' "$phpize_orig"
-  fi
-}
-
-# Function to restore phpize.
-restore_phpize() {
-  if [ "$os" = "Darwin" ]; then
-    sudo mv "$phpize_orig.bck" "$phpize_orig" || true
-  fi
-}
-
-# Function to patch pdo_oci.
-patch_pdo_oci_config() {
-  get -q -n config.m4 https://raw.githubusercontent.com/php/php-src/PHP-8.0/ext/pdo_oci/config.m4
-  if [[ ${version:?} =~ 5.[3-6] ]]; then
-    sudo sed -i '' "/PHP_CHECK_PDO_INCLUDES/d" config.m4 2>/dev/null || sudo sed -i "/PHP_CHECK_PDO_INCLUDES/d" config.m4
-  fi
-}
-
-# Function to install the dependencies.
-add_dependencies() {
-  if [ "$os" = 'Linux' ]; then
-    if [ "${runner:?}" = "self-hosted" ]; then
-      ${apt_install:?} --no-upgrade --no-install-recommends libaio-dev
-    fi
-    ! [[ ${version:?} =~ $nightly_versions ]] && add_devtools phpize
   fi
 }
 
@@ -82,20 +37,13 @@ add_dependencies() {
 add_oci_helper() {
   if ! [ -e "${ext_dir:?}/$ext.so" ]; then
     status='Installed and enabled'
-    phpize_orig=$(get_phpize)
+    read -r "${ext}_LINUX_LIBS" <<< "libaio-dev"
-    tag=$(php_src_tag)
+    read -r "${ext}_CONFIGURE_OPTS" <<< "--with-php-config=$(command -v php-config) --with-${ext/_/-}=instantclient,$oracle_client"
-    get_php
+    read -r "${ext}_PATH" <<< "ext/$ext"
     patch_phpize
-    (
+    add_extension_from_source "$ext" https://github.com php php-src "$(php_src_tag)" extension get
-      cd "/opt/oracle/php-src-$tag/ext/$ext" || exit 1
-      [ "$ext" = "pdo_oci" ] && patch_pdo_oci_config
-      sudo phpize && ./configure --with-php-config="$(command -v php-config)" --with-"${ext/_/-}"=instantclient,"$oracle_client"
-      sudo make -j"$(nproc 2>/dev/null || sysctl -n hw.ncpu)"
-      sudo cp ./modules/* "$ext_dir/"
-    )
     restore_phpize
   fi
-  echo "extension=$ext.so" | sudo tee "${scan_dir:?}/99-$ext.ini"
 }
 
 # Function to add oci extension oci8 and pdo_oci.
@@ -106,8 +54,10 @@ add_oci() {
   oracle_client=$oracle_home/instantclient
   os=$(uname -s)
   add_client >/dev/null 2>&1
-  add_dependencies >/dev/null 2>&1
   add_oci_helper >/dev/null 2>&1
   add_extension_log "$ext" "$status"
   check_extension "$ext" && add_license_log
 }
+
+# shellcheck source=.
+. "${scripts:?}"/ext/patches/phpize.sh

src/scripts/ext/patches/firebird.sh

@@ -0,0 +1,11 @@
+patch_firebird() {
+  if [[ "${version:?}" =~ ${old_versions:?} ]]; then
+    sudo sed -i '' '/PHP_CHECK_PDO_INCLUDES/d' config.m4 2>/dev/null || sudo sed -i '/PHP_CHECK_PDO_INCLUDES/d' config.m4
+  fi
+  lib_arch=$(gcc -dumpmachine)
+  lib_dir=/usr/lib/"$lib_arch"
+  if [ -d "$lib_dir" ]; then
+    sudo ln -sf "$lib_dir"/libfbclient.so.2 /usr/lib/libfbclient.so
+    sudo ln -sf "$lib_dir"/libib_util.so /usr/lib/
+  fi
+}

src/scripts/ext/patches/geos.sh

@@ -0,0 +1,7 @@
+patch_geos() {
+  if [ "$(php -r "echo PHP_VERSION_ID;")" -ge 70000 ]; then
+    sed -i~ -e "s/, ce->name/, ZSTR_VAL(ce->name)/; s/ulong /zend_ulong /" geos.c
+  fi
+  get -q -n /tmp/php8.patch https://git.remirepo.net/cgit/rpms/php/php-geos.git/plain/0003-add-all-arginfo-and-fix-build-with-PHP-8.patch
+  patch -p1 < /tmp/php8.patch 2>/dev/null || true
+}

src/scripts/ext/patches/http.sh

@@ -0,0 +1,11 @@
+patch_pecl_http() {
+  if [ "$(uname -s)" = 'Darwin' ] && ! [[ ${version:?} =~ ${old_versions:?} ]]; then
+    if [[ ${version:?} =~ 5.6|7.[0-4] ]]; then
+      sed -i '' -e "s|ext/propro|$(brew --prefix propro@"${version:?}")/include/php/ext/propro@${version:?}|" "./src/php_http_api.h"
+    fi
+    sed -i '' -e "s|ext/raphf|$(brew --prefix raphf@"${version:?}")/include/php/ext/raphf@${version:?}|" "./src/php_http_api.h"
+    if [ "${version:?}" = "5.6" ]; then
+      sed -i '' -e "s|\$abs_srcdir|\$abs_srcdir ${brew_prefix:?}/include|" -e "s|/ext/propro|/php/ext/propro@5.6|" -e "s|/ext/raphf|/php/ext/raphf@5.6|" "./config9.m4"
+    fi
+  fi
+}

src/scripts/ext/patches/pdo_oci.sh

@@ -0,0 +1,6 @@
+patch_pdo_oci() {
+  get -q -n config.m4 https://raw.githubusercontent.com/php/php-src/PHP-8.0/ext/pdo_oci/config.m4
+  if [[ ${version:?} =~ 5.[3-6] ]]; then
+    sudo sed -i '' "/PHP_CHECK_PDO_INCLUDES/d" config.m4 2>/dev/null || sudo sed -i "/PHP_CHECK_PDO_INCLUDES/d" config.m4
+  fi
+}

src/scripts/ext/patches/phpize.sh

@@ -0,0 +1,26 @@
+# Function to get phpize location on darwin.
+get_phpize() {
+  if [[ "${version:?}" =~ 5.[3-5] ]]; then
+    echo '/opt/local/bin/phpize'
+  else
+    echo "/usr/local/bin/$(readlink /usr/local/bin/phpize)"
+  fi
+}
+
+# Function to patch phpize to link to php headers on darwin.
+patch_phpize() {
+  if [ "$(uname -s)" = "Darwin" ]; then
+    sudo cp "$phpize_orig" "$phpize_orig.bck"
+    sudo sed -i '' 's~includedir=.*~includedir="$(xcrun --show-sdk-path)/usr/include/php"~g' "$phpize_orig"
+  fi
+}
+
+# Function to restore phpize.
+restore_phpize() {
+  if [ "$os" = "Darwin" ]; then
+    sudo mv "$phpize_orig.bck" "$phpize_orig" || true
+  fi
+}
+
+os="$(uname -s)"
+phpize_orig="$(get_phpize)"

src/scripts/ext/patches/protobuf.sh

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

src/scripts/ext/phalcon.ps1

@@ -5,7 +5,7 @@ Function Add-PhalconHelper() {
   } else {
     $domain = 'https://github.com'
     $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
-    $match = Invoke-WebRequest -Uri $domain/phalcon/cphalcon/releases | Select-String -Pattern "href=`"(.*phalcon_x64_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)`""
+    $match = Invoke-WebRequest -Uri "$domain/phalcon/cphalcon/releases/v3.4.5" | Select-String -Pattern "href=`"(.*phalcon_x64_.*_php${version}_${extension_version}.*[0-9]${nts}.zip)`""
     $zip_file = $match.Matches[0].Groups[1].Value
     Invoke-WebRequest -Uri $domain/$zip_file -OutFile $ENV:RUNNER_TOOL_CACHE\phalcon.zip > $null 2>&1
     Expand-Archive -Path $ENV:RUNNER_TOOL_CACHE\phalcon.zip -DestinationPath $ENV:RUNNER_TOOL_CACHE\phalcon -Force > $null 2>&1

src/scripts/ext/phalcon.sh

@@ -1,20 +1,11 @@
 # Helper function to add phalcon.
 add_phalcon_helper() {
   status='Installed and enabled'
-  if [ "$os_name" = "Linux" ]; then
   update_lists
   if [ "$extension" = "phalcon4" ]; then
     ${apt_install:?} "php${version:?}-psr" "php${version:?}-$extension"
   else
-      get -q -e /tmp/phalcon.deb "https://packagecloud.io/phalcon/stable/packages/ubuntu/bionic/php${version:?}-phalcon_3.4.5-1+php${version:?}_amd64.deb/download.deb"
+    ${apt_install:?} "php${version:?}-$extension"
-      sudo dpkg -i /tmp/phalcon.deb
-    fi
-  else
-    sed -i '' '/extension.*psr/d' "${ini_file:?}"
-    add_brew_tap shivammathur/homebrew-phalcon
-    brew install phalcon@"${version:?}"_"$extension_major_version"
-    sudo cp "${brew_prefix:?}"/opt/psr@"${version:?}"/psr.so "${ext_dir:?}"
-    sudo cp "${brew_prefix:?}"/opt/phalcon@"${version:?}"_"$extension_major_version"/phalcon.so "${ext_dir:?}"
   fi
 }
 
@@ -57,7 +48,6 @@ add_phalcon4() {
 add_phalcon() {
   extension=$1
   status='Enabled'
-  os_name=$(uname -s)
   phalcon_ini_file="${pecl_file:-${ini_file[@]}}"
   extension_major_version=${extension: -1}
   if [ "$extension_major_version" = "4" ]; then

src/scripts/ext/source.sh

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

src/scripts/linux.sh

@@ -3,35 +3,41 @@ self_hosted_helper() {
   if ! command -v apt-fast >/dev/null; then
     sudo ln -sf /usr/bin/apt-get /usr/bin/apt-fast
   fi
-  install_packages curl make software-properties-common unzip autoconf automake gcc g++
+  install_packages apt-transport-https curl make software-properties-common unzip autoconf automake gcc g++
-  add_ppa
+  add_ppa ondrej/php
 }
 
 # Function to backup and cleanup package lists.
 cleanup_lists() {
+  ppa_prefix=${1-ondrej}
   if [ ! -e /etc/apt/sources.list.d.save ]; then
     sudo mv /etc/apt/sources.list.d /etc/apt/sources.list.d.save
     sudo mkdir /etc/apt/sources.list.d
-    sudo mv /etc/apt/sources.list.d.save/*ondrej*.list /etc/apt/sources.list.d/
+    sudo mv /etc/apt/sources.list.d.save/*"${ppa_prefix}"*.list /etc/apt/sources.list.d/
     trap "sudo mv /etc/apt/sources.list.d.save/*.list /etc/apt/sources.list.d/ 2>/dev/null" exit
   fi
 }
 
 # Function to add ppa:ondrej/php.
 add_ppa() {
-  if ! apt-cache policy | grep -q ondrej/php; then
+  ppa=${1:-ondrej/php}
-    cleanup_lists
+  if [ "$DISTRIB_RELEASE" = "16.04" ] && [ "$ppa" = "ondrej/php" ]; then
-    LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y
+    LC_ALL=C.UTF-8 sudo apt-add-repository --remove ppa:"$ppa" -y || true
+    LC_ALL=C.UTF-8 sudo apt-add-repository http://setup-php.com/ondrej/php/ubuntu -y
+    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv 4f4ea0aae5267a6c
+  elif ! apt-cache policy | grep -q "$ppa"; then
+    cleanup_lists "$(dirname "$ppa")"
+    LC_ALL=C.UTF-8 sudo apt-add-repository ppa:"$ppa" -y
+  fi
   if [ "$DISTRIB_RELEASE" = "16.04" ]; then
     sudo "$debconf_fix" apt-get update
   fi
-  fi
 }
 
 # Function to update the package lists.
 update_lists() {
   if [ ! -e /tmp/setup_php ]; then
-    [ "$DISTRIB_RELEASE" = "20.04" ] && add_ppa >/dev/null 2>&1
+    [ "${runner:?}" != "self-hosted" ] && add_ppa >/dev/null 2>&1
     cleanup_lists
     sudo "$debconf_fix" apt-get update >/dev/null 2>&1
     echo '' | sudo tee /tmp/setup_php >/dev/null 2>&1
@@ -57,9 +63,7 @@ delete_extension() {
   extension=$1
   disable_extension "$extension"
   sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1
-  if [ "${runner:?}" = "self-hosted" ]; then
+  sudo sed -i "/Package: php$version-$extension/,/^$/d" /var/lib/dpkg/status
-    $apt_remove "php-$extension" "php$version-$extension" >/dev/null 2>&1 || true
-  fi
 }
 
 # Function to disable and delete extensions.
@@ -68,7 +72,6 @@ remove_extension() {
   if check_extension "$extension"; then
     if [[ ! "$version" =~ ${old_versions:?} ]] && [ -e /etc/php/"$version"/mods-available/"$extension".ini ]; then
       sudo phpdismod -v "$version" "$extension" >/dev/null 2>&1
-      echo "$extension" | sudo tee -a /tmp/setup_php_dismod >/dev/null 2>&1
     fi
     delete_extension "$extension"
     (! check_extension "$extension" && add_log "${tick:?}" ":$extension" "Removed") ||
@@ -87,8 +90,10 @@ add_pdo_extension() {
   else
     ext=$1
     ext_name=$1
+    if [ -e "$ext_dir"/pdo.so ]; then
       disable_extension pdo
       echo "extension=pdo.so" | sudo tee "${ini_file[@]/php.ini/conf.d/10-pdo.ini}" >/dev/null 2>&1
+    fi
     if [ "$ext" = "mysql" ]; then
       enable_extension "mysqlnd" "extension"
       ext_name='mysqli'
@@ -126,41 +131,20 @@ add_extension() {
   sudo chmod 777 "${ini_file[@]}"
 }
 
-# Function to install a PECL version.
-add_pecl_extension() {
-  extension=$1
-  pecl_version=$2
-  prefix=$3
-  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot|preview).* ]]; then
-    pecl_version=$(get_pecl_version "$extension" "$pecl_version")
-  fi
-  enable_extension "$extension" "$prefix"
-  ext_version=$(php -r "echo phpversion('$extension');")
-  if [ "$ext_version" = "$pecl_version" ]; then
-    add_log "${tick:?}" "$extension" "Enabled"
-  else
-    delete_extension "$extension"
-    pecl_install "$extension-$pecl_version"
-    add_extension_log "$extension-$pecl_version" "Installed and enabled"
-  fi
-}
-
 # Function to setup phpize and php-config.
 add_devtools() {
   tool=$1
   if ! command -v "$tool$version" >/dev/null; then
     install_packages "php$version-dev" "php$version-xml"
   fi
-  sudo update-alternatives --set php-config /usr/bin/php-config"$version" >/dev/null 2>&1
+  switch_version "phpize" "php-config"
-  sudo update-alternatives --set phpize /usr/bin/phpize"$version" >/dev/null 2>&1
-  configure_pecl >/dev/null 2>&1
   add_log "${tick:?}" "$tool" "Added $tool $semver"
 }
 
 # Function to setup the nightly build from shivammathur/php-builder
 setup_nightly() {
   run_script "php-builder" "$runner" "$version"
-  extra_version="($(cat "/etc/php/$version/COMMIT"))"
+  extra_version="-dev ($(cat "/etc/php/$version/COMMIT"))"
 }
 
 # Function to setup PHP 5.3, PHP 5.4 and PHP 5.5.
@@ -181,9 +165,11 @@ add_pecl() {
 
 # Function to switch versions of PHP binaries.
 switch_version() {
-  for tool in pear pecl php phar phar.phar php-cgi php-config phpize phpdbg; do
+  tools=("$@") && ! (( ${#tools[@]} )) && tools+=(pear pecl php phar phar.phar php-cgi php-config phpize phpdbg)
+  to_wait=()
+  for tool in "${tools[@]}"; do
     if [ -e "/usr/bin/$tool$version" ]; then
-      sudo update-alternatives --set $tool /usr/bin/"$tool$version" &
+      sudo update-alternatives --set "$tool" /usr/bin/"$tool$version" &
       to_wait+=($!)
     fi
   done
@@ -204,7 +190,7 @@ add_packaged_php() {
 # Function to update PHP.
 update_php() {
   initial_version=$(php_semver)
-  use_package_cache="false" add_packaged_php
+  add_packaged_php
   updated_version=$(php_semver)
   if [ "$updated_version" != "$initial_version" ]; then
     status="Updated to"
@@ -281,10 +267,10 @@ version=$1
 dist=$2
 debconf_fix="DEBIAN_FRONTEND=noninteractive"
 apt_install="sudo $debconf_fix apt-fast install -y"
-apt_remove="sudo $debconf_fix apt-fast remove -y"
 scripts="${dist}"/../src/scripts
 
 # shellcheck source=.
+. "${scripts:?}"/ext/source.sh
 . "${scripts:?}"/tools/add_tools.sh
 . "${scripts:?}"/common.sh
 . /etc/lsb-release

src/scripts/tools/protoc.sh

@@ -19,7 +19,7 @@ add_protoc() {
     [ "$(uname -s)" = "Darwin" ] && platform='osx'
     get -q -n /tmp/protobuf.zip "https://github.com/protocolbuffers/protobuf/releases/download/$protobuf_tag/protoc-${protobuf_tag:1}-$platform-x86_64.zip"
     sudo unzip /tmp/protobuf.zip -d /usr/local/
-    sudo chmod 777 /usr/local/bin/protoc -R /usr/local/include/google
+    sudo chmod -R 777 /usr/local/bin/protoc /usr/local/include/google
   ) >/dev/null 2>&1
   add_log "${tick:?}" "protoc" "Added protoc ${protobuf_tag:1}"
   printf "::group::\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "protoc" "Click to read the protoc related license information"

src/scripts/win32.ps1

@@ -101,7 +101,9 @@ Function Install-PSPackage() {
     [Parameter(Position = 1, Mandatory = $true)]
     $psm1_path,
     [Parameter(Position = 2, Mandatory = $true)]
-    $url
+    $url,
+    [Parameter(Position = 3, Mandatory = $true)]
+    $cmdlet
   )
   $module_path = "$bin_dir\$psm1_path.psm1"
   if(-not (Test-Path $module_path -PathType Leaf)) {
@@ -111,6 +113,31 @@ Function Install-PSPackage() {
   }
   Import-Module $module_path
   Add-ToProfile $current_profile "$package-search" "Import-Module $module_path"
+
+  if($null -eq (Get-Command $cmdlet -ErrorAction SilentlyContinue)) {
+    Install-Module -Name $cmdlet -Force
+  }
+}
+
+Function Add-ExtensionPrerequisites{
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateLength(1, [int]::MaxValue)]
+    [string]
+    $extension
+  )
+  $deps_dir = "$ext_dir\$extension-vc$installed.VCVersion-$arch"
+  $extensions_with_dependencies = ('imagick')
+  if($extensions_with_dependencies.Contains($extension)) {
+    if(-not(Test-Path $deps_dir)) {
+      New-Item $deps_dir -Type Directory 2>&1 | Out-Null
+      Install-PhpExtensionPrerequisite -Extension $extension -InstallPath $deps_dir -PhpPath $php_dir
+    }
+    Get-ChildItem -Recurse -Path $deps_dir | ForEach-Object {
+      New-Item -Itemtype SymbolicLink -Path $php_dir -Name $_.Name -Target $_.FullName -Force >$null 2>&1
+    }
+  }
 }
 
 # Function to add PHP extensions.
@@ -143,16 +170,18 @@ Function Add-Extension {
           Add-Log $tick $extension "Enabled"
         }
         default {
+          Add-ExtensionPrerequisites $extension
           Enable-PhpExtension -Extension $extension_info.Handle -Path $php_dir
           Add-Log $tick $extension "Enabled"
         }
       }
     }
     else {
+      Add-ExtensionPrerequisites $extension
       if($extension_version -ne '') {
-        Install-PhpExtension -Extension $extension -Version $extension_version -MinimumStability $stability -MaximumStability $stability -Path $php_dir
+        Install-PhpExtension -Extension $extension -Version $extension_version -MinimumStability $stability -MaximumStability $stability -Path $php_dir -NoDependencies
       } else {
-        Install-PhpExtension -Extension $extension -MinimumStability $stability -MaximumStability $stability -Path $php_dir
+        Install-PhpExtension -Extension $extension -MinimumStability $stability -MaximumStability $stability -Path $php_dir -NoDependencies
       }
 
       Add-Log $tick $extension "Installed and enabled"
@@ -219,7 +248,8 @@ Function Get-ToolVersion() {
       [Parameter(Position = 1, Mandatory = $true)]
       $param
   )
-  $version_regex = "[0-9]+((\.{1}[0-9]+)+)(\.{0})(-[a-z0-9]+){0,1}"
+  $alp = "[a-zA-Z0-9]"
+  $version_regex = "[0-9]+((\.{1}$alp+)+)(\.{0})(-$alp+){0,1}"
   if($tool -eq 'composer') {
     if ($param -eq 'snapshot') {
       $composer_version = (Select-String -Pattern "const\sBRANCH_ALIAS_VERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern $version_regex | ForEach-Object { $_.matches.Value }) + '+' + (Select-String -Pattern "const\sVERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern "[a-zA-Z0-9]+" -AllMatches | ForEach-Object { $_.matches[2].Value })
@@ -308,14 +338,15 @@ Function Add-Composertool() {
   if(Test-Path $composer_lock) {
     Remove-Item -Path $composer_lock -Force
   }
-  composer global require $prefix$release >$null 2>&1
+  (composer global require $prefix$release 2>&1 | Tee-Object -FilePath $env:APPDATA\Composer\composer.log) >$null 2>&1
   $json = findstr $prefix$tool $env:APPDATA\Composer\composer.json
+  $log = findstr $prefix$tool $env:APPDATA\Composer\composer.log
   if(Test-Path $composer_bin\composer) {
     Copy-Item -Path "$bin_dir\composer" -Destination "$composer_bin\composer" -Force
   }
   Add-ToolsHelper $tool
   if($json) {
-    $tool_version = Get-ToolVersion "Write-Output" "$json"
+    $tool_version = Get-ToolVersion "Write-Output" "$log"
     Add-Log $tick $tool "Added $tool $tool_version"
   } else {
     Add-Log $cross $tool "Could not setup $tool"
@@ -384,7 +415,7 @@ if($env:RUNNER -eq 'self-hosted') {
 
 Add-Printf >$null 2>&1
 Step-Log "Setup PhpManager"
-Install-PSPackage PhpManager PhpManager\PhpManager "$github/mlocati/powershell-phpmanager/releases/latest/download/PhpManager.zip" >$null 2>&1
+Install-PSPackage PhpManager PhpManager\PhpManager "$github/mlocati/powershell-phpmanager/releases/latest/download/PhpManager.zip" Get-Php >$null 2>&1
 Add-Log $tick "PhpManager" "Installed"
 
 Step-Log "Setup PHP"
@@ -397,7 +428,7 @@ if (Test-Path -LiteralPath $php_dir -PathType Container) {
 $status = "Installed"
 if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version -replace '^(\d+(\.\d+)*).*', '$1.'))) -or $ts -ne $installed.ThreadSafe) {
   if ($version -lt '7.0' -and (Get-InstalledModule).Name -notcontains 'VcRedist') {
-    Install-PSPackage VcRedist VcRedist-main\VcRedist\VcRedist "$github/aaronparker/VcRedist/archive/main.zip" >$null 2>&1
+    Install-PSPackage VcRedist VcRedist-main\VcRedist\VcRedist "$github/aaronparker/VcRedist/archive/main.zip" Get-VcList >$null 2>&1
   }
   try {
     if ($version -match $nightly_versions) {
@@ -430,10 +461,6 @@ if($version -lt "5.5") {
 } else {
   $enable_extensions += ('opcache')
 }
-# Patch till there is a pcov DLL for PHP 8.0 on pecl
-if ($version -eq '8.0') {
-  Invoke-WebRequest -Uri "https://github.com/shivammathur/php-extensions-windows/releases/latest/download/php$version`_$env:PHPTS`_$arch`_pcov.dll" -OutFile $php_dir"\ext\php`_pcov.dll"
-}
 Enable-PhpExtension -Extension $enable_extensions -Path $php_dir
 Update-PhpCAInfo -Path $php_dir -Source $cert_source
 Copy-Item -Path $dist\..\src\configs\*.json -Destination $env:RUNNER_TOOL_CACHE

src/tools.ts

@@ -7,7 +7,8 @@ import * as utils from './utils';
  */
 export async function getToolVersion(version: string): Promise<string> {
   // semver_regex - https://semver.org/
-  const semver_regex = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/;
+  const semver_regex =
+    /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/;
   const composer_regex = /^stable$|^preview$|^snapshot$|^v?[1|2]$/;
   version = version.replace(/[><=^]*/, '');
   switch (true) {
@@ -32,12 +33,17 @@ export async function parseTool(
   const parts: string[] = release.split(':');
   const tool: string = parts[0];
   const version: string | undefined = parts[1];
-  switch (version) {
+  switch (true) {
-    case undefined:
+    case version === undefined:
       return {
         name: tool,
         version: 'latest'
       };
+    case /^[\w.-]+\/[\w.-]+$/.test(tool):
+      return {
+        name: tool,
+        version: version
+      };
     default:
       return {
         name: tool,
@@ -245,7 +251,8 @@ export async function getWpCliUrl(version: string): Promise<string> {
  */
 export async function addComposer(tools_list: string[]): Promise<string[]> {
   const regex_any = /^composer($|:.*)/;
-  const regex_valid = /^composer:?($|preview$|snapshot$|v?[1-2]$|v?\d+\.\d+\.\d+[\w-]*$)/;
+  const regex_valid =
+    /^composer:?($|preview$|snapshot$|v?[1-2]$|v?\d+\.\d+\.\d+[\w-]*$)/;
   const matches: string[] = tools_list.filter(tool => regex_valid.test(tool));
   let composer = 'composer';
   tools_list = tools_list.filter(tool => !regex_any.test(tool));
@@ -283,29 +290,6 @@ export async function getComposerUrl(version: string): Promise<string> {
   }
 }
 
-/**
- * Function to get Tools list after cleanup
- *
- * @param tools_csv
- */
-export async function getCleanedToolsList(
-  tools_csv: string
-): Promise<string[]> {
-  let tools_list: string[] = await utils.CSVArray(tools_csv);
-  tools_list = await addComposer(tools_list);
-  tools_list = tools_list
-    .map(function (extension: string) {
-      return extension
-        .trim()
-        .replace(
-          /-agent|behat\/|codeception\/|hirak\/|icanhazstring\/|laravel\/|narrowspark\/automatic-|overtrue\/|phpspec\/|robmorgan\/|symfony\//,
-          ''
-        );
-    })
-    .filter(Boolean);
-  return [...new Set(tools_list)];
-}
-
 /**
  * Helper function to get script to setup a tool using a phar url
  *
@@ -386,8 +370,13 @@ export async function addTools(
   php_version: string,
   os_version: string
 ): Promise<string> {
-  let script = '\n' + (await utils.stepLog('Setup Tools', os_version));
+  let script = '\n';
-  const tools_list: Array<string> = await getCleanedToolsList(tools_csv);
+  if (tools_csv === 'none') {
+    return '';
+  } else {
+    script += await utils.stepLog('Setup Tools', os_version);
+  }
+  const tools_list = await addComposer(await utils.CSVArray(tools_csv));
   await utils.asyncForEach(tools_list, async function (release: string) {
     const tool_data: {name: string; version: string} = await parseTool(release);
     const tool: string = tool_data.name;
@@ -403,124 +392,123 @@ export async function addTools(
     );
     script += '\n';
     let url = '';
-    switch (tool) {
+    switch (true) {
-      case 'blackfire':
+      case /^blackfire(-agent)?$/.test(tool):
-      case 'grpc_php_plugin':
+        script += await utils.customPackage(
-      case 'protoc':
+          'blackfire',
+          'tools',
+          version,
+          os_version
+        );
+        break;
+      case /^grpc_php_plugin$|^protoc$/.test(tool):
         script += await utils.customPackage(tool, 'tools', version, os_version);
         break;
-      case 'behat':
+      case /^behat$|^codeception$|^phpspec$/.test(tool):
-      case 'codeception':
-      case 'phpspec':
         script += await addPackage(tool, release, tool + '/', os_version);
         break;
-      case 'blackfire-player':
+      case /^blackfire-player$/.test(tool):
         url = await getBlackfirePlayerUrl(version, php_version);
         script += await addArchive(tool, url, os_version, '"-V"');
         break;
-      case 'composer':
+      case /^composer$/.test(tool):
         url = await getComposerUrl(version);
         script += await addArchive('composer', url, os_version, version);
         break;
-      case 'composer-normalize':
+      case /^composer-normalize$/.test(tool):
         uri = await getUri(tool, '.phar', version, 'releases', '', 'download');
         url = github + 'ergebnis/composer-normalize/' + uri;
         script += await addArchive(tool, url, os_version, '"-V"');
         break;
-      case 'composer-prefetcher':
+      case /^composer-prefetcher$/.test(tool):
         script += await addPackage(
-          tool,
+          'automatic-' + tool,
           release,
-          'narrowspark/automatic-',
+          'narrowspark/',
           os_version
         );
         break;
-      case 'composer-require-checker':
+      case /^composer-require-checker$/.test(tool):
         uri = await getUri(tool, '.phar', version, 'releases', '', 'download');
         url = github + 'maglnet/ComposerRequireChecker/' + uri;
         script += await addArchive(tool, url, os_version, '"-V"');
         break;
-      case 'composer-unused':
+      case /^composer-unused$/.test(tool):
         script += await addPackage(tool, release, 'icanhazstring/', os_version);
         break;
-      case 'cs2pr':
+      case /^cs2pr$/.test(tool):
         uri = await getUri(tool, '', version, 'releases', '', 'download');
         url = github + 'staabm/annotate-pull-request-from-checkstyle/' + uri;
         script += await addArchive(tool, url, os_version, '"-V"');
         break;
-      case 'deployer':
+      case /^deployer$/.test(tool):
         url = await getDeployerUrl(version);
         script += await addArchive(tool, url, os_version, '"-V"');
         break;
-      case 'flex':
+      case /^flex$/.test(tool):
         script += await addPackage(tool, release, 'symfony/', os_version);
         break;
-      case 'infection':
+      case /^infection$/.test(tool):
         url = github + 'infection/infection/' + uri;
         script += await addArchive(tool, url, os_version, '"-V"');
         break;
-      case 'pecl':
+      case /^pecl/.test(tool):
         script += await utils.getCommand(os_version, 'pecl');
         break;
-      case 'phan':
+      case /^phan$/.test(tool):
         url = github + 'phan/phan/' + uri;
         script += await addArchive(tool, url, os_version, '"-v"');
         break;
-      case 'phing':
+      case /^phing$/.test(tool):
         url = 'https://www.phing.info/get/phing-' + version + '.phar';
         script += await addArchive(tool, url, os_version, '"-v"');
         break;
-      case 'phinx':
+      case /^phinx$/.test(tool):
         script += await addPackage(tool, release, 'robmorgan/', os_version);
         break;
-      case 'phive':
+      case /^phive$/.test(tool):
         script += await addPhive(version, php_version, os_version);
         break;
-      case 'php-config':
+      case /^php(-config|ize)$/.test(tool):
-      case 'phpize':
         script += await addDevTools(tool, os_version);
         break;
-      case 'php-cs-fixer':
+      case /^php-cs-fixer$/.test(tool):
         uri = await getUri(tool, '.phar', version, 'releases', 'v', 'download');
         url = github + 'FriendsOfPHP/PHP-CS-Fixer/' + uri;
         script += await addArchive(tool, url, os_version, '"-V"');
         break;
-      case 'phpcbf':
+      case /^php(cbf|cs)$/.test(tool):
-      case 'phpcs':
         url = github + 'squizlabs/PHP_CodeSniffer/' + uri;
         script += await addArchive(tool, url, os_version, '"--version"');
         break;
-      case 'phpcpd':
+      case /^php(cpd|unit)$/.test(tool):
-      case 'phpunit':
         url = await getPharUrl('https://phar.phpunit.de', tool, '', version);
         script += await addArchive(tool, url, os_version, '"--version"');
         break;
-      case 'phplint':
+      case /^phplint$/.test(tool):
         script += await addPackage(tool, release, 'overtrue/', os_version);
         break;
-      case 'phpmd':
+      case /^phpmd$/.test(tool):
         url = github + 'phpmd/phpmd/' + uri;
         script += await addArchive(tool, url, os_version, '"--version"');
         break;
-      case 'phpstan':
+      case /^phpstan$/.test(tool):
         url = github + 'phpstan/phpstan/' + uri;
         script += await addArchive(tool, url, os_version, '"-V"');
         break;
-      case 'prestissimo':
+      case /^prestissimo$/.test(tool):
         script += await addPackage(tool, release, 'hirak/', os_version);
         break;
-      case 'psalm':
+      case /^psalm$/.test(tool):
         url = github + 'vimeo/psalm/' + uri;
         script += await addArchive(tool, url, os_version, '"-v"');
         break;
-      case 'symfony':
+      case /^symfony(-cli)?$/.test(tool):
-      case 'symfony-cli':
         uri = await getSymfonyUri(version, os_version);
         url = github + 'symfony/cli/' + uri;
         script += await addArchive('symfony', url, os_version, 'version');
         break;
-      case 'vapor-cli':
+      case /^vapor(-cli)?$/.test(tool):
-      case 'vapor':
         script += await addPackage(
           'vapor-cli',
           release,
@@ -528,11 +516,20 @@ export async function addTools(
           os_version
         );
         break;
-      case 'wp':
+      case /^wp(-cli)?$/.test(tool):
-      case 'wp-cli':
         url = github + (await getWpCliUrl(version));
         script += await addArchive('wp-cli', url, os_version, '"--version"');
         break;
+      case /^none$/.test(tool):
+        break;
+      case /^[\w.-]+\/[\w.-]+$/.test(tool):
+        script += await addPackage(
+          tool.split('/')[1],
+          release.split('/')[1].replace(/\s+/, ''),
+          tool.split('/')[0] + '/',
+          os_version
+        );
+        break;
       default:
         script += await utils.addLog(
           '$cross',

src/utils.ts

@@ -247,6 +247,9 @@ export async function extensionArray(
       return extension_csv
         .split(',')
         .map(function (extension: string) {
+          if (/.+-.+\/.+@.+/.test(extension)) {
+            return extension;
+          }
           return extension
             .trim()
             .toLowerCase()
@@ -438,3 +441,24 @@ export async function customPackage(
   const command: string = await getCommand(os_version, pkg_name);
   return '\n. ' + script + '\n' + command + version;
 }
+
+/**
+ * Function to extension input for installation from source.
+ *
+ * @param extension
+ * @param prefix
+ */
+export async function parseExtensionSource(
+  extension: string,
+  prefix: string
+): Promise<string> {
+  // Groups: extension, domain url, org, repo, release
+  const regex = /(\w+)-(.+:\/\/.+(?:[.:].+)+\/)?([\w.-]+)\/([\w.-]+)@(.+)/;
+  const matches = regex.exec(extension) as RegExpExecArray;
+  matches[2] = matches[2] ? matches[2].slice(0, -1) : 'https://github.com';
+  return await joins(
+    '\nadd_extension_from_source',
+    ...matches.splice(1, matches.length),
+    prefix
+  );
+}

tsconfig.json

@@ -1,63 +1,18 @@
 {
   "compilerOptions": {
-    /* Basic Options */
+    "esModuleInterop": true,
-    // "incremental": true,                   /* Enable incremental compilation */
+    "lib": [
-    "target": "ES2019",                       /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
+      "ESNext"
-    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+    ],
-    // "allowJs": true,                       /* Allow javascript files to be compiled. */
+    "module": "commonjs",
-    // "checkJs": true,                       /* Report errors in .js files. */
+    "moduleResolution": "node",
-    // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+    "noImplicitAny": true,
-    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    "outDir": "./lib",
-    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    "removeComments": true,
-    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
+    "rootDir": "./src",
-    // "outFile": "./",                       /* Concatenate and emit output to single file. */
+    "sourceMap": true,
-    "outDir": "./lib",                        /* Redirect output structure to the directory. */
+    "strict": true,
-    "rootDir": "./src",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    "target": "ESNext"
-    // "composite": true,                     /* Enable project compilation */
-    // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
-    // "removeComments": true,                /* Do not emit comments to output. */
-    // "noEmit": true,                        /* Do not emit outputs. */
-    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
-    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
-    // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
-
-    /* Strict Type-Checking Options */
-    "strict": true,                           /* Enable all strict type-checking options. */
-    // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
-    // "strictNullChecks": true,              /* Enable strict null checks. */
-    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
-    // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
-    // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
-    // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
-    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
-
-    /* Additional Checks */
-    // "noUnusedLocals": true,                /* Report errors on unused locals. */
-    // "noUnusedParameters": true,            /* Report errors on unused parameters. */
-    // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
-    // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
-
-    /* Module Resolution Options */
-    // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-    // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
-    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
-    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
-    // "typeRoots": [],                       /* List of folders to include type definitions from. */
-    // "types": [],                           /* Type declaration files to be included in compilation. */
-    // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    "esModuleInterop": true                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
-    // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
-
-    /* Source Map Options */
-    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
-    // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
-    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
-    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
-
-    /* Experimental Options */
-    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
-    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
   },
-  "exclude": ["node_modules", "**/*.test.ts"]
+  "exclude": ["__tests__", "lib", "node_modules"]
 }