Merge pull request #242 from shivammathur/develop

Remove update_formulae in darwin.sh

.github/workflows/experimental-workflow.yml

@@ -1,88 +0,0 @@
-name: Experimental workflow
-on:
-  pull_request:
-    branches:
-      - nightly
-      - master
-      - develop
-      - verbose
-    paths-ignore:
-      - '**.md'
-      - 'examples/**'
-  push:
-    branches:
-      - nightly
-      - master
-      - develop
-      - verbose
-    paths-ignore:
-      - '**.md'
-      - 'examples/**'
-jobs:
-  run:
-    name: Run
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      fail-fast: false
-      matrix:
-        operating-system: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-latest, macos-latest]
-        php-versions: ['8.0']
-    env:
-      extensions: xml, opcache, pcov
-      key: cache-v2
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup cache environment
-        id: cache-env
-        uses: shivammathur/cache-extensions@develop
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-          key: ${{ env.key }}
-
-      - name: Cache extensions
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.cache-env.outputs.dir }}
-          key: ${{ steps.cache-env.outputs.key }}
-          restore-keys: ${{ steps.cache-env.outputs.key }}
-
-      - name: Setup PHP with extensions and custom config
-        run: node dist/index.js
-        env:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-          ini-values: post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata
-          coverage: pcov
-
-      - name: Testing PHP version
-        run: |
-          php -v
-          php -r "if(strpos(phpversion(), '${{ matrix.php-versions }}') === false) {throw new Exception('Wrong PHP version Installed');}"
-
-      - name: Testing Composer version
-        run: |
-          composer -V
-          php -r "if(strpos(@exec('composer -V'), 'Composer version') === false) {throw new Exception('Composer not found');}"
-      - name: Testing Extensions
-        run: |
-          php -m
-          php -r "if(! extension_loaded('mbstring')) {throw new Exception('mbstring not found');}"
-          php -r "if(! extension_loaded('pcov')) {throw new Exception('PCOV not found');}"
-      - name: Testing ini values
-        run: |
-          php -r "if(ini_get('post_max_size')!='256M') {throw new Exception('post_max_size not added');}"
-          php -r "if(ini_get('short_open_tag')!=1) {throw new Exception('short_open_tag not added');}"
-          php -r "if(ini_get('date.timezone')!='Asia/Kolkata') {throw new Exception('date.timezone not added');}"
-      - name: Test JIT
-        run: |
-          php -r "if(! extension_loaded('Zend OPcache')) {throw new Exception('Zend OPcache not found');}"
-          php -r "if(ini_get('opcache.jit_buffer_size')!='256M') {throw new Exception('opcache.jit_buffer_size not set');}"
-          php -r "if(ini_get('opcache.jit')!=1235) {throw new Exception('opcache.jit not set');}"
-          php -r "if(ini_get('pcre.jit')!=1) {throw new Exception('pcre.jit not set');}"
-      - name: Benchmark JIT
-        run: |
-          curl -o bench.php https://raw.githubusercontent.com/php/php-src/master/Zend/bench.php
-          php bench.php

.github/workflows/workflow.yml

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

README.md

@@ -43,10 +43,11 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
   - [Composer GitHub OAuth](#composer-github-oauth)
   - [Problem Matchers](#problem-matchers)
   - [Examples](#examples)
+- [Versioning](#bookmark-versioning)
 - [License](#scroll-license)
 - [Contributions](#1-contributions)
 - [Support This Project](#sparkling_heart-support-this-project)
-- [Dependencies](#bookmark-dependencies)
+- [Dependencies](#package-dependencies)
 - [Further Reading](#bookmark_tabs-further-reading)
 
 ## :tada: PHP Support
@@ -185,7 +186,7 @@ with:
 ### Xdebug
 
 Specify `coverage: xdebug` to use `Xdebug`.  
-Runs on all [PHP versions supported](#tada-php-support "List of PHP versions supported on this GitHub Action") except `8.0`.
+Runs on all [PHP versions supported](#tada-php-support "List of PHP versions supported on this GitHub Action").
 
 ```yaml
 uses: shivammathur/setup-php@v2
@@ -338,7 +339,8 @@ steps:
 > Setup PHP on a self-hosted runner.
 
 - To setup a dockerized self-hosted runner, refer to this [guide](https://github.com/shivammathur/setup-php/wiki/Dockerized-self-hosted-runner-on-Ubuntu) to setup in an `Ubuntu` container and refer to this [guide](https://github.com/shivammathur/setup-php/wiki/Dockerized-self-hosted-runner-on-Windows) to setup in a `Windows` container.
-- To setup the runner directly on the host OS or in a VM, follow this [requirements guide](https://github.com/shivammathur/setup-php/wiki/Requirements-for-self-hosted-runners "Requirements guide for self-hosted runner to run setup-php") before setting up the self-hosted runner.
+- To setup the runner directly on the host OS or in a virtual machine, follow this [requirements guide](https://github.com/shivammathur/setup-php/wiki/Requirements-for-self-hosted-runners "Requirements guide for self-hosted runner to run setup-php") before setting up the self-hosted runner.
+- If your workflow uses [services](https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idservices "GitHub Actions Services"), then setup the runner on a Linux host or in a Linux virtual machine. GitHub Actions does not support nested virtualization on Linux, so services will not work in a dockerized container.
 
 Specify the environment variable `runner` with the value `self-hosted`. Without this your workflow will fail.
 
@@ -470,7 +472,7 @@ steps:
   uses: actions/checkout@v2
 
 - name: Setup cache environment
-  id: cache-env
+  id: extcache
   uses: shivammathur/cache-extensions@v1
   with:
     php-version: ${{ matrix.php-versions }}
@@ -480,9 +482,9 @@ steps:
 - name: Cache extensions
   uses: actions/cache@v2
   with:
-    path: ${{ steps.cache-env.outputs.dir }}
+    path: ${{ steps.extcache.outputs.dir }}
-    key: ${{ steps.cache-env.outputs.key }}
+    key: ${{ steps.extcache.outputs.key }}
-    restore-keys: ${{ steps.cache-env.outputs.key }}
+    restore-keys: ${{ steps.extcache.outputs.key }}
 
 - name: Setup PHP
   uses: shivammathur/setup-php@v2
@@ -499,13 +501,13 @@ If your project uses composer, you can persist composer's internal cache directo
 
 ```yaml
 - name: Get composer cache directory
-  id: composer-cache
+  id: composercache
   run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
 - name: Cache dependencies
   uses: actions/cache@v2
   with:
-    path: ${{ steps.composer-cache.outputs.dir }}
+    path: ${{ steps.composercache.outputs.dir }}
     key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
     restore-keys: ${{ runner.os }}-composer-
 
@@ -527,13 +529,13 @@ If your project has node.js dependencies, you can persist npm's or yarn's cache
 
 ```yaml
 - name: Get node.js cache directory
-  id: node-cache-dir
+  id: nodecache
   run: echo "::set-output name=dir::$(npm config get cache)" # Use $(yarn cache dir) for yarn
 
 - name: Cache dependencies
   uses: actions/cache@v2
   with:
-    path: ${{ steps.node-cache-dir.outputs.dir }}
+    path: ${{ steps.nodecache.outputs.dir }}
     key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} # Use '**/yarn.lock' for yarn
     restore-keys: ${{ runner.os }}-node-
 ```
@@ -593,7 +595,7 @@ For examples refer to [cs2pr documentation](https://github.com/staabm/annotate-p
 
 ### Examples
 
-Examples for setting up this GitHub Action with different PHP Frameworks/Packages.
+Examples of using `setup-php` with various PHP Frameworks and Packages.
 
 |Framework/Package|Runs on|Workflow|
 |--- |--- |--- |
@@ -621,13 +623,25 @@ Examples for setting up this GitHub Action with different PHP Frameworks/Package
 |Yii2 Starter Kit with `PostgreSQL`|`ubuntu`|[yii2-postgres.yml](./examples/yii2-postgres.yml "GitHub Action for Yii2 Starter Kit with PostgreSQL")|
 |Zend Framework|`macOS`, `ubuntu` and `windows`|[zend-framework.yml](./examples/zend-framework.yml "GitHub Action for Zend Framework")|
 
+## :bookmark: Versioning
+
+- It is highly recommended to use the `v2` tag as `setup-php` version. It is a rolling tag and is synced with latest minor and patch releases. With `v2` you automatically get the bug fixes, new features and support for latest PHP releases. For debugging any issues `verbose` tag can be used temporarily. It outputs all the logs and is also synced with the latest releases.
+- Semantic release versions can also be used. It is recommended to [use dependabot](https://docs.github.com/en/github/administering-a-repository/keeping-your-actions-up-to-date-with-github-dependabot "Setup Dependabot with GitHub Actions") with semantic versioning to keep the actions in your workflows up to date.
+- Commit SHA can also be used, but are not recommended. They have to be updated with every release manually, without which you will not get any bug fixes or new features. 
+- Using the `master` branch as version is highly discouraged, it might break your workflow after major releases as they have breaking changes.
+- If you are using the `v1` tag or a `1.x.y` version, it is recommended that you [switch to v2](https://github.com/shivammathur/setup-php/wiki/Switch-to-v2 "Guide for switching from setup-php v1 to v2") as `v1` only gets critical bug fixes. Maintenance support for `v1` will be dropped with the last `PHP 8.0` release.
+
 ## :scroll: License
 
-The scripts and documentation in this project are released under the [MIT License](LICENSE "License for shivammathur/setup-php"). This project has multiple [dependencies](#bookmark-dependencies "Dependencies for this PHP Action"). Their licenses can be found in their respective repositories.
+- The scripts and documentation in this project are released under the [MIT License](LICENSE "License for shivammathur/setup-php"). 
+- This project has multiple [dependencies](#bookmark-dependencies "Dependencies for this PHP Action"). Their licenses can be found in their respective repositories.
 
 ## :+1: Contributions
 
-Contributions are welcome! See [Contributor's Guide](.github/CONTRIBUTING.md "shivammathur/setup-php contribution guide"). If you face any issues while using this or want to suggest a feature/improvement, create an issue [here](https://github.com/shivammathur/setup-php/issues "Issues reported").
+> Contributions are welcome!
+
+- See [Contributor's Guide](.github/CONTRIBUTING.md "shivammathur/setup-php contribution guide") before you start.
+- If you face any issues while using this or want to suggest a feature/improvement, create an issue [here](https://github.com/shivammathur/setup-php/issues "Issues reported").
 
 ## :sparkling_heart: Support This Project
 
@@ -638,14 +652,15 @@ If this action helped you.
 - If you blog, write about your experience of using this action.
 - If you need any help using this, please contact me using [Codementor](https://www.codementor.io/shivammathur "Shivam Mathur Codementor")
 
-## :bookmark: Dependencies
+## :package: Dependencies
 
 - [Node.js dependencies](https://github.com/shivammathur/setup-php/network/dependencies "Node.js dependencies")
 - [gplessis/dotdeb-php](https://github.com/gplessis/dotdeb-php "Packaging for end of life PHP versions")
 - [mlocati/powershell-phpmanager](https://github.com/mlocati/powershell-phpmanager "Package to handle PHP on windows")
 - [ppa:ondrej/php](https://launchpad.net/~ondrej/+archive/ubuntu/php "Packaging active PHP packages")
 - [shivammathur/cache-extensions](https://github.com/shivammathur/cache-extensions "GitHub action to help with caching PHP extensions")
-- [shivammathur/homebrew-php](https://github.com/shivammathur/homebrew-php "Tap for PHP builds for MacOS")
+- [shivammathur/homebrew-php](https://github.com/shivammathur/homebrew-php "Tap for PHP builds on MacOS")
+- [shivammathur/homebrew-extensions](https://github.com/shivammathur/homebrew-extensions "Tap for PHP extensions on MacOS")
 - [shivammathur/php-builder](https://github.com/shivammathur/php-builder "Nightly PHP package")
 - [shivammathur/php5-darwin](https://github.com/shivammathur/php5-darwin "Scripts to setup PHP5 versions on darwin")
 - [shivammathur/php5-ubuntu](https://github.com/shivammathur/php5-ubuntu "Scripts to setup PHP5 versions on ubuntu")

__tests__/coverage.test.ts

@@ -1,15 +1,9 @@
 import * as coverage from '../src/coverage';
 
-jest.mock('../src/extensions', () => ({
-  addExtension: jest.fn().mockImplementation(extension => {
-    return 'add_extension ' + extension + '\n';
-  })
-}));
-
 describe('Config tests', () => {
   it('checking addCoverage with PCOV on windows', async () => {
     let win32: string = await coverage.addCoverage('PCOV', '7.4', 'win32');
-    expect(win32).toContain('add_extension pcov');
+    expect(win32).toContain('Add-Extension pcov');
     expect(win32).toContain('Remove-Extension xdebug');
 
     win32 = await coverage.addCoverage('pcov', '7.0', 'win32');
@@ -33,22 +27,30 @@ describe('Config tests', () => {
 
   it('checking addCoverage with Xdebug on windows', async () => {
     const win32: string = await coverage.addCoverage('xdebug', '7.4', 'win32');
-    expect(win32).toContain('add_extension xdebug');
+    expect(win32).toContain('Add-Extension xdebug');
-  });
-
-  it('checking addCoverage with Xdebug on windows', async () => {
-    const win32: string = await coverage.addCoverage('xdebug', '8.0', 'win32');
-    expect(win32).toContain('Xdebug currently only supports PHP 7.4 or lower');
-  });
-
-  it('checking addCoverage with Xdebug on linux', async () => {
-    const linux: string = await coverage.addCoverage('xdebug', '7.4', 'linux');
-    expect(linux).toContain('add_extension xdebug');
   });
 
   it('checking addCoverage with Xdebug on linux', async () => {
     const linux: string = await coverage.addCoverage('xdebug', '8.0', 'linux');
-    expect(linux).toContain('Xdebug currently only supports PHP 7.4 or lower');
+    expect(linux).toContain('add_extension xdebug');
+  });
+
+  it('checking addCoverage with Xdebug3 on linux', async () => {
+    const linux: string = await coverage.addCoverage('xdebug3', '7.4', 'linux');
+    expect(linux).toContain('add_extension_from_source xdebug');
+    expect(linux).toContain('echo "xdebug.mode=coverage"');
+  });
+
+  it('checking addCoverage with Xdebug3 on linux', async () => {
+    const linux: string = await coverage.addCoverage('xdebug3', '8.0', 'linux');
+    expect(linux).toContain('add_extension xdebug');
+    expect(linux).toContain('echo "xdebug.mode=coverage"');
+  });
+
+  it('checking addCoverage with Xdebug on linux', async () => {
+    const linux: string = await coverage.addCoverage('xdebug', '8.0', 'linux');
+    expect(linux).toContain('add_extension xdebug');
+    expect(linux).toContain('echo "xdebug.mode=coverage"');
   });
 
   it('checking addCoverage with Xdebug on darwin', async () => {
@@ -60,15 +62,6 @@ describe('Config tests', () => {
     expect(darwin).toContain('add_extension xdebug');
   });
 
-  it('checking addCoverage with Xdebug on darwin', async () => {
-    const darwin: string = await coverage.addCoverage(
-      'xdebug',
-      '8.0',
-      'darwin'
-    );
-    expect(darwin).toContain('Xdebug currently only supports PHP 7.4 or lower');
-  });
-
   it('checking disableCoverage windows', async () => {
     const win32 = await coverage.addCoverage('none', '7.4', 'win32');
     expect(win32).toContain('Remove-Extension xdebug');

__tests__/extensions.test.ts

@@ -1,6 +1,12 @@
 import * as extensions from '../src/extensions';
 
 describe('Extension tests', () => {
+  it('checking getXdebugVersion', async () => {
+    expect(await extensions.getXdebugVersion('5.3')).toContain('2.2.7');
+    expect(await extensions.getXdebugVersion('5.4')).toContain('2.4.1');
+    expect(await extensions.getXdebugVersion('5.5')).toContain('2.5.5');
+    expect(await extensions.getXdebugVersion('5.6')).toContain('2.9.6');
+  });
   it('checking addExtensionOnWindows', async () => {
     let win32: string = await extensions.addExtension(
       'Xdebug, pcov, sqlite, :intl, phalcon4, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2',
@@ -50,11 +56,14 @@ describe('Extension tests', () => {
 
   it('checking addExtensionOnLinux', async () => {
     let linux: string = await extensions.addExtension(
-      'Xdebug, pcov, sqlite, :intl, ast, uopz, ast-beta, pdo_mysql, pdo-odbc, xdebug-alpha, grpc-1.2.3',
+      'Xdebug, xdebug3, pcov, sqlite, :intl, ast, uopz, ast-beta, pdo_mysql, pdo-odbc, xdebug-alpha, grpc-1.2.3',
       '7.4',
       'linux'
     );
-    expect(linux).toContain('update_extension xdebug 2.9.3');
+    expect(linux).toContain('update_extension xdebug 2.9.6');
+    expect(linux).toContain(
+      'add_extension_from_source xdebug xdebug/xdebug master --enable-xdebug zend_extension'
+    );
     expect(linux).toContain('sudo $debconf_fix apt-get install -y php7.4-pcov');
     expect(linux).toContain(
       'sudo $debconf_fix apt-get install -y php7.4-sqlite3'
@@ -70,6 +79,11 @@ describe('Extension tests', () => {
       'add_unstable_extension xdebug alpha zend_extension'
     );
 
+    linux = await extensions.addExtension('xdebug3', '8.0', 'linux');
+    expect(linux).toContain(
+      'sudo $debconf_fix apt-get install -y php8.0-xdebug'
+    );
+
     linux = await extensions.addExtension('gearman', '7.0', 'linux');
     expect(linux).toContain('gearman.sh 7.0');
     linux = await extensions.addExtension('gearman', '7.1', 'linux');
@@ -100,12 +114,15 @@ describe('Extension tests', () => {
 
   it('checking addExtensionOnDarwin', async () => {
     let darwin: string = await extensions.addExtension(
-      'Xdebug, pcov, sqlite, :intl, ast-beta, grpc-1.2.3',
+      'Xdebug, pcov, grpc, protobuf, swoole, sqlite, :intl, ast-beta, grpc-1.2.3',
       '7.2',
       'darwin'
     );
-    expect(darwin).toContain('sudo pecl install -f xdebug');
+    expect(darwin).toContain('add_brew_extension xdebug');
-    expect(darwin).toContain('sudo pecl install -f pcov');
+    expect(darwin).toContain('add_brew_extension pcov');
+    expect(darwin).toContain('add_brew_extension grpc');
+    expect(darwin).toContain('add_brew_extension protobuf');
+    expect(darwin).toContain('add_brew_extension swoole');
     expect(darwin).toContain('sudo pecl install -f sqlite3');
     expect(darwin).toContain('remove_extension intl');
     expect(darwin).toContain('add_unstable_extension ast beta extension');
@@ -121,7 +138,7 @@ describe('Extension tests', () => {
     expect(darwin).toContain('sudo pecl install -f pcov');
 
     darwin = await extensions.addExtension('pcov', '7.2', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f pcov');
+    expect(darwin).toContain('add_brew_extension pcov');
 
     darwin = await extensions.addExtension('xdebug', '5.3', 'darwin');
     expect(darwin).toContain('sudo pecl install -f xdebug-2.2.7');
@@ -133,13 +150,13 @@ describe('Extension tests', () => {
     expect(darwin).toContain('sudo pecl install -f xdebug-2.5.5');
 
     darwin = await extensions.addExtension('xdebug', '5.6', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug-2.5.5');
+    expect(darwin).toContain('add_brew_extension xdebug');
 
     darwin = await extensions.addExtension('xdebug', '7.0', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug-2.9.0');
+    expect(darwin).toContain('add_brew_extension xdebug');
 
     darwin = await extensions.addExtension('xdebug', '7.2', 'darwin');
-    expect(darwin).toContain('sudo pecl install -f xdebug');
+    expect(darwin).toContain('add_brew_extension xdebug');
 
     darwin = await extensions.addExtension('redis', '5.6', 'darwin');
     expect(darwin).toContain('sudo pecl install -f redis-2.2.8');

__tests__/tools.test.ts

@@ -384,7 +384,7 @@ describe('Tools tests', () => {
 
   it('checking addTools on linux', async () => {
     const script: string = await tools.addTools(
-      'blackfire, blackfire-player, cs2pr, flex, php-cs-fixer, phpstan, phpunit, pecl, phinx, phinx:1.2.3, phive, php-config, phpize, symfony, wp-cli',
+      'blackfire, blackfire-player, cs2pr, flex, php-cs-fixer, phplint, phpstan, phpunit, pecl, phinx, phinx:1.2.3, phive, php-config, phpize, symfony, wp-cli',
       '7.4',
       'linux'
     );
@@ -419,6 +419,7 @@ describe('Tools tests', () => {
     expect(script).toContain('add_pecl');
     expect(script).toContain('add_composertool flex flex symfony/');
     expect(script).toContain('add_composertool phinx phinx robmorgan/');
+    expect(script).toContain('add_composertool phplint phplint overtrue/');
     expect(script).toContain('add_composertool phinx phinx:1.2.3 robmorgan/');
     expect(script).toContain('add_devtools');
     expect(script).toContain('add_log "$tick" "php-config" "Added"');

__tests__/utils.test.ts

@@ -155,6 +155,7 @@ describe('Utils tests', () => {
     );
     expect(await utils.getExtensionPrefix('xsl')).toEqual('extension');
     expect(await utils.getExtensionPrefix('xdebug')).toEqual('zend_extension');
+    expect(await utils.getExtensionPrefix('xdebug3')).toEqual('zend_extension');
     expect(await utils.getExtensionPrefix('opcache')).toEqual('zend_extension');
   });
 

dist/index.js

@@ -1218,13 +1218,17 @@ exports.CSVArray = CSVArray;
  * @param extension
  */
 async function getExtensionPrefix(extension) {
-    const zend = ['xdebug', 'opcache', 'ioncube', 'eaccelerator'];
+    const zend = [
+        'xdebug',
+        'xdebug3',
+        'opcache',
+        'ioncube',
+        'eaccelerator'
+    ];
     switch (zend.indexOf(extension)) {
-        case 0:
+        default:
-        case 1:
             return 'zend_extension';
         case -1:
-        default:
             return 'extension';
     }
 }
@@ -1914,7 +1918,7 @@ async function getCleanedToolsList(tools_csv) {
         .map(function (extension) {
         return extension
             .trim()
-            .replace(/symfony\/|laravel\/|robmorgan\/|hirak\/|narrowspark\/automatic-/, '');
+            .replace(/hirak\/|laravel\/|narrowspark\/automatic-|overtrue\/|robmorgan\/|symfony\//, '');
     })
         .filter(Boolean);
     return [...new Set(tools_list)];
@@ -2058,6 +2062,9 @@ async function addTools(tools_csv, php_version, os_version) {
             case 'phinx':
                 script += await addPackage(tool, release, 'robmorgan/', os_version);
                 break;
+            case 'phplint':
+                script += await addPackage(tool, release, 'overtrue/', os_version);
+                break;
             case 'prestissimo':
                 script += await addPackage(tool, release, 'hirak/', os_version);
                 break;
@@ -2142,21 +2149,24 @@ const config = __importStar(__webpack_require__(641));
 /**
  * Function to setup Xdebug
  *
+ * @param extension
  * @param version
  * @param os_version
  * @param pipe
  */
-async function addCoverageXdebug(version, os_version, pipe) {
+async function addCoverageXdebug(extension, version, os_version, pipe) {
-    switch (version) {
+    const xdebug = (await extensions.addExtension(extension, version, os_version, true)) +
-        case '8.0':
+        pipe;
-            return ('\n' +
+    const ini = (await config.addINIValues('xdebug.mode=coverage', os_version, true)) +
-                (await utils.addLog('$cross', 'xdebug', 'Xdebug currently only supports PHP 7.4 or lower', os_version)));
+        pipe;
-        case '7.4':
+    const log = await utils.addLog('$tick', extension, 'Xdebug enabled as coverage driver', os_version);
+    switch (true) {
+        case /^xdebug3$/.test(extension):
+        case /^8\.0$/.test(version):
+            return '\n' + xdebug + '\n' + ini + '\n' + log;
+        case /^xdebug$/.test(extension):
         default:
-            return ((await extensions.addExtension('xdebug', version, os_version, true)) +
+            return xdebug + '\n' + log;
-                pipe +
-                '\n' +
-                (await utils.addLog('$tick', 'xdebug', 'Xdebug enabled as coverage driver', os_version)));
     }
 }
 exports.addCoverageXdebug = addCoverageXdebug;
@@ -2237,7 +2247,9 @@ async function addCoverage(coverage_driver, version, os_version) {
         case 'pcov':
             return script + (await addCoveragePCOV(version, os_version, pipe));
         case 'xdebug':
-            return script + (await addCoverageXdebug(version, os_version, pipe));
+        case 'xdebug3':
+            return (script +
+                (await addCoverageXdebug(coverage_driver, version, os_version, pipe)));
         case 'none':
             return script + (await disableCoverage(version, os_version, pipe));
         default:
@@ -2283,10 +2295,10 @@ const utils = __importStar(__webpack_require__(163));
  */
 async function addINIValuesUnix(ini_values_csv) {
     const ini_values = await utils.CSVArray(ini_values_csv);
-    let script = '\n';
+    let script = '';
     await utils.asyncForEach(ini_values, async function (line) {
         script +=
-            (await utils.addLog('$tick', line, 'Added to php.ini', 'linux')) + '\n';
+            '\n' + (await utils.addLog('$tick', line, 'Added to php.ini', 'linux'));
     });
     return 'echo "' + ini_values.join('\n') + '" >> $ini_file' + script;
 }
@@ -2685,9 +2697,27 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addExtension = exports.addExtensionLinux = exports.addExtensionWindows = exports.addExtensionDarwin = void 0;
+exports.addExtension = exports.addExtensionLinux = exports.addExtensionWindows = exports.addExtensionDarwin = exports.getXdebugVersion = void 0;
 const path = __importStar(__webpack_require__(622));
 const utils = __importStar(__webpack_require__(163));
+/**
+ * Function to get Xdebug version compatible with php versions
+ *
+ * @param version
+ */
+async function getXdebugVersion(version) {
+    switch (version) {
+        case '5.3':
+            return '2.2.7';
+        case '5.4':
+            return '2.4.1';
+        case '5.5':
+            return '2.5.5';
+        default:
+            return '2.9.6';
+    }
+}
+exports.getXdebugVersion = getXdebugVersion;
 /**
  * Install and enable extensions for darwin
  *
@@ -2741,25 +2771,22 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
                         ' ' +
                         ext_prefix;
                 return;
-            // match 5.3xdebug
+            // match 5.3xdebug...5.5xdebug
-            case /5\.3xdebug/.test(version_extension):
+            case /5\.[3-5]xdebug/.test(version_extension):
-                command = command_prefix + 'xdebug-2.2.7' + pipe;
+                command =
+                    command_prefix + 'xdebug-' + (await getXdebugVersion(version));
                 break;
-            // match 5.4xdebug
+            // match 5.6xdebug to 8.0xdebug, 5.6swoole to 8.0swoole
-            case /5\.4xdebug/.test(version_extension):
+            // match 5.6grpc to 7.4grpc, 5.6protobuf to 7.4protobuf
-                command = command_prefix + 'xdebug-2.4.1' + pipe;
+            // match 7.1pcov to 8.0pcov
-                break;
+            case /(5\.6|7\.[0-4]|8\.[0-9])(xdebug|swoole)/.test(version_extension):
-            // match 5.5xdebug and 5.6xdebug
+            case /(5\.6|7\.[0-4])(grpc|protobuf)/.test(version_extension):
-            case /5\.[5-6]xdebug/.test(version_extension):
+            case /(7\.[1-4]|8\.[0-9])pcov/.test(version_extension):
-                command = command_prefix + 'xdebug-2.5.5' + pipe;
+                command = 'add_brew_extension ' + ext_name;
-                break;
-            // match 7.0redis
-            case /7\.0xdebug/.test(version_extension):
-                command = command_prefix + 'xdebug-2.9.0' + pipe;
                 break;
             // match 5.6redis
             case /5\.6redis/.test(version_extension):
-                command = command_prefix + 'redis-2.2.8' + pipe;
+                command = command_prefix + 'redis-2.2.8';
                 break;
             // match imagick
             case /^imagick$/.test(extension):
@@ -2774,7 +2801,7 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
             // match sqlite
             case /^sqlite$/.test(extension):
                 extension = 'sqlite3';
-                command = command_prefix + extension + pipe;
+                command = command_prefix + extension;
                 break;
             // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
             case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
@@ -2787,7 +2814,7 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
                         version;
                 return;
             default:
-                command = command_prefix + extension + pipe;
+                command = command_prefix + extension;
                 break;
         }
         add_script +=
@@ -2949,10 +2976,20 @@ async function addExtensionLinux(extension_csv, version, pipe) {
                         ' ' +
                         version;
                 return;
+            // match 7.2xdebug3..7.4xdebug3
+            case /^7\.[2-4]xdebug3$/.test(version_extension):
+                add_script +=
+                    '\nadd_extension_from_source xdebug xdebug/xdebug master --enable-xdebug zend_extension';
+                return;
+            // match 8.0xdebug3
+            case /^8\.[0-9]xdebug3$/.test(version_extension):
+                extension = 'xdebug';
+                command = command_prefix + version + '-' + extension + pipe;
+                break;
             // match 7.1xdebug..7.4xdebug
             case /^7\.[1-4]xdebug$/.test(version_extension):
                 add_script +=
-                    '\nupdate_extension xdebug 2.9.3' +
+                    '\nupdate_extension xdebug 2.9.6' +
                         pipe +
                         '\n' +
                         (await utils.addLog('$tick', 'xdebug', 'Enabled', 'linux'));

examples/bedrock.yml

@@ -17,16 +17,16 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: composer install -n --prefer-dist
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: PHP test
         run: composer test

examples/cakephp-mysql.yml

@@ -37,19 +37,19 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
         run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
           composer run-script post-install-cmd --no-interaction
       # Add a step to run migrations if required
       - name: Test with phpunit
@@ -70,18 +70,18 @@ jobs:
           php-version: '7.3'
           extensions: mbstring, intl
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: PHP CodeSniffer
         run: composer cs-check
 
@@ -98,17 +98,17 @@ jobs:
           extensions: mbstring, intl
           tools: phpstan
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Static Analysis using PHPStan
         run: phpstan analyse --no-progress src/

examples/cakephp-postgres.yml

@@ -35,19 +35,19 @@ jobs:
           extensions: mbstring, intl, redis, pdo_pgsql
           coverage: pcov
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
         run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
           composer run-script post-install-cmd --no-interaction
       # Add a step to run migrations if required
       - name: Test with phpunit
@@ -68,18 +68,18 @@ jobs:
           php-version: '7.3'
           extensions: mbstring, intl
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: PHP CodeSniffer
         run: composer cs-check
 
@@ -96,17 +96,17 @@ jobs:
           extensions: mbstring, intl
           tools: phpstan
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Static Analysis using PHPStan
         run: phpstan analyse --no-progress src/

examples/cakephp.yml

@@ -19,19 +19,19 @@ jobs:
           extensions: mbstring, intl, pdo_sqlite, pdo_mysql
           coverage: pcov #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
         run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
           composer run-script post-install-cmd --no-interaction
       - name: Test with phpunit
         run: vendor/bin/phpunit --coverage-text
@@ -48,18 +48,18 @@ jobs:
           php-version: '7.3'
           extensions: mbstring, intl
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: PHP CodeSniffer
         run: composer cs-check
 
@@ -76,17 +76,17 @@ jobs:
           extensions: mbstring, intl
           tools: phpstan
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Static Analysis using PHPStan
         run: phpstan analyse --no-progress src/

examples/codeigniter.yml

@@ -18,17 +18,17 @@ jobs:
           extensions: mbstring, intl, curl, dom
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Test with phpunit
         run: vendor/bin/phpunit --coverage-text

examples/laravel-mysql.yml

@@ -44,18 +44,18 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Prepare the application
         run: |
           php -r "file_exists('.env') || copy('.env.example', '.env');"

examples/laravel-postgres.yml

@@ -44,18 +44,18 @@ jobs:
           extensions: mbstring, dom, fileinfo, pgsql
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Prepare the application
         run: |
           php -r "file_exists('.env') || copy('.env.example', '.env');"

examples/laravel.yml

@@ -20,18 +20,18 @@ jobs:
           extensions: mbstring, dom, fileinfo
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Prepare the application
         run: |
           php -r "file_exists('.env') || copy('.env.example', '.env');"

examples/lumen-mysql.yml

@@ -44,19 +44,19 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
         run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
           composer require predis/predis illuminate/redis
       - name: Prepare the application
         run: php -r "file_exists('.env') || copy('.env.example', '.env');"

examples/lumen-postgres.yml

@@ -44,19 +44,19 @@ jobs:
           extensions: mbstring, dom, fileinfo, pgsql
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
         run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
           composer require predis/predis illuminate/redis
       - name: Prepare the application
         run: php -r "file_exists('.env') || copy('.env.example', '.env');"

examples/lumen.yml

@@ -20,18 +20,18 @@ jobs:
           extensions: mbstring, dom, fileinfo, mysql
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Prepare the application
         run: php -r "file_exists('.env') || copy('.env.example', '.env');"
       - name: Test with phpunit

examples/phalcon-mysql.yml

@@ -44,18 +44,18 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Prepare the application
         run: php -r "file_exists('.env') || copy('.env.example', '.env');"
       - name: Run Migration

examples/phalcon-postgres.yml

@@ -43,18 +43,18 @@ jobs:
           extensions: mbstring, dom, zip, phalcon4, pgsql #use phalcon3 for the phalcon 3.x
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Prepare the application
         run: php -r "file_exists('.env') || copy('.env.example', '.env');"
       - name: Run Migration

examples/sage.yml

@@ -33,12 +33,12 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: ${{ runner.os }}-yarn-
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -46,7 +46,7 @@ jobs:
       - name: Install yarn dependencies
         run: yarn -V
       - name: Install Composer dependencies
-        run: composer install -o --prefer-dist --no-interaction
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Yarn test and build
         run: |
           yarn run test

examples/slim-framework.yml

@@ -18,17 +18,17 @@ jobs:
           extensions: mbstring, simplexml, dom
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Test with phpunit
         run: vendor/bin/phpunit --coverage-text

examples/symfony-mysql.yml

@@ -31,19 +31,19 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
         run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Run Migration
         run: |
           composer require symfony/orm-pack

examples/symfony-postgres.yml

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

examples/symfony.yml

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

examples/yii2-mysql.yml

@@ -41,18 +41,18 @@ jobs:
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Prepare the application
         run: |
           php -r "file_exists('.env') || copy('.env.dist', '.env');"

examples/yii2-postgres.yml

@@ -39,18 +39,18 @@ jobs:
           extensions: mbstring, intl, gd, imagick, zip, dom, pgsql
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Prepare the application
         run: |
           php -r "file_exists('.env') || copy('.env.dist', '.env');"

examples/zend-framework.yml

@@ -18,19 +18,19 @@ jobs:
           extensions: mbstring, bcmath, curl, intl
           coverage: xdebug #optional
       - name: Get composer cache directory
-        id: composer-cache
+        id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
         uses: actions/cache@v2
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ steps.composercache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
           # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install dependencies
         run: |
-          composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+          composer install --no-progress --prefer-dist --optimize-autoloader
           composer require --dev phpunit/phpunit squizlabs/php_codesniffer zendframework/zend-test
       - name: Test with phpunit
         run: vendor/bin/phpunit --coverage-text

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "dist/index.js",
@@ -30,22 +30,22 @@
     "fs": "0.0.1-security"
   },
   "devDependencies": {
-    "@types/jest": "^25.2.3",
+    "@types/jest": "^26.0.3",
-    "@types/node": "^14.0.12",
+    "@types/node": "^14.0.14",
-    "@typescript-eslint/eslint-plugin": "^3.2.0",
+    "@typescript-eslint/eslint-plugin": "^3.6.0",
-    "@typescript-eslint/parser": "^3.2.0",
+    "@typescript-eslint/parser": "^3.6.0",
     "@zeit/ncc": "^0.22.3",
-    "eslint": "^7.2.0",
+    "eslint": "^7.4.0",
     "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-import": "^2.21.1",
+    "eslint-plugin-import": "^2.22.0",
-    "eslint-plugin-jest": "^23.13.2",
+    "eslint-plugin-jest": "^23.18.0",
-    "eslint-plugin-prettier": "^3.1.3",
+    "eslint-plugin-prettier": "^3.1.4",
     "husky": "^4.2.5",
-    "jest": "^26.0.1",
+    "jest": "^26.1.0",
-    "jest-circus": "^26.0.1",
+    "jest-circus": "^26.1.0",
     "prettier": "^2.0.5",
-    "ts-jest": "^26.1.0",
+    "ts-jest": "^26.1.1",
-    "typescript": "^3.9.5"
+    "typescript": "^3.9.6"
   },
   "husky": {
     "skipCI": true,

src/config.ts

@@ -9,10 +9,10 @@ export async function addINIValuesUnix(
   ini_values_csv: string
 ): Promise<string> {
   const ini_values: Array<string> = await utils.CSVArray(ini_values_csv);
-  let script = '\n';
+  let script = '';
   await utils.asyncForEach(ini_values, async function (line: string) {
     script +=
-      (await utils.addLog('$tick', line, 'Added to php.ini', 'linux')) + '\n';
+      '\n' + (await utils.addLog('$tick', line, 'Added to php.ini', 'linux'));
   });
   return 'echo "' + ini_values.join('\n') + '" >> $ini_file' + script;
 }

src/coverage.ts

@@ -5,39 +5,36 @@ import * as config from './config';
 /**
  * Function to setup Xdebug
  *
+ * @param extension
  * @param version
  * @param os_version
  * @param pipe
  */
 export async function addCoverageXdebug(
+  extension: string,
   version: string,
   os_version: string,
   pipe: string
 ): Promise<string> {
-  switch (version) {
+  const xdebug =
-    case '8.0':
+    (await extensions.addExtension(extension, version, os_version, true)) +
-      return (
+    pipe;
-        '\n' +
+  const ini =
-        (await utils.addLog(
+    (await config.addINIValues('xdebug.mode=coverage', os_version, true)) +
-          '$cross',
+    pipe;
-          'xdebug',
+  const log = await utils.addLog(
-          'Xdebug currently only supports PHP 7.4 or lower',
-          os_version
-        ))
-      );
-    case '7.4':
-    default:
-      return (
-        (await extensions.addExtension('xdebug', version, os_version, true)) +
-        pipe +
-        '\n' +
-        (await utils.addLog(
     '$tick',
-          'xdebug',
+    extension,
     'Xdebug enabled as coverage driver',
     os_version
-        ))
   );
+  switch (true) {
+    case /^xdebug3$/.test(extension):
+    case /^8\.0$/.test(version):
+      return '\n' + xdebug + '\n' + ini + '\n' + log;
+    case /^xdebug$/.test(extension):
+    default:
+      return xdebug + '\n' + log;
   }
 }
 
@@ -151,7 +148,11 @@ export async function addCoverage(
     case 'pcov':
       return script + (await addCoveragePCOV(version, os_version, pipe));
     case 'xdebug':
-      return script + (await addCoverageXdebug(version, os_version, pipe));
+    case 'xdebug3':
+      return (
+        script +
+        (await addCoverageXdebug(coverage_driver, version, os_version, pipe))
+      );
     case 'none':
       return script + (await disableCoverage(version, os_version, pipe));
     default:

src/extensions.ts

@@ -1,6 +1,24 @@
 import * as path from 'path';
 import * as utils from './utils';
 
+/**
+ * Function to get Xdebug version compatible with php versions
+ *
+ * @param version
+ */
+export async function getXdebugVersion(version: string): Promise<string> {
+  switch (version) {
+    case '5.3':
+      return '2.2.7';
+    case '5.4':
+      return '2.4.1';
+    case '5.5':
+      return '2.5.5';
+    default:
+      return '2.9.6';
+  }
+}
+
 /**
  * Install and enable extensions for darwin
  *
@@ -60,25 +78,22 @@ export async function addExtensionDarwin(
           ' ' +
           ext_prefix;
         return;
-      // match 5.3xdebug
+      // match 5.3xdebug...5.5xdebug
-      case /5\.3xdebug/.test(version_extension):
+      case /5\.[3-5]xdebug/.test(version_extension):
-        command = command_prefix + 'xdebug-2.2.7' + pipe;
+        command =
+          command_prefix + 'xdebug-' + (await getXdebugVersion(version));
         break;
-      // match 5.4xdebug
+      // match 5.6xdebug to 8.0xdebug, 5.6swoole to 8.0swoole
-      case /5\.4xdebug/.test(version_extension):
+      // match 5.6grpc to 7.4grpc, 5.6protobuf to 7.4protobuf
-        command = command_prefix + 'xdebug-2.4.1' + pipe;
+      // match 7.1pcov to 8.0pcov
-        break;
+      case /(5\.6|7\.[0-4]|8\.[0-9])(xdebug|swoole)/.test(version_extension):
-      // match 5.5xdebug and 5.6xdebug
+      case /(5\.6|7\.[0-4])(grpc|protobuf)/.test(version_extension):
-      case /5\.[5-6]xdebug/.test(version_extension):
+      case /(7\.[1-4]|8\.[0-9])pcov/.test(version_extension):
-        command = command_prefix + 'xdebug-2.5.5' + pipe;
+        command = 'add_brew_extension ' + ext_name;
-        break;
-      // match 7.0redis
-      case /7\.0xdebug/.test(version_extension):
-        command = command_prefix + 'xdebug-2.9.0' + pipe;
         break;
       // match 5.6redis
       case /5\.6redis/.test(version_extension):
-        command = command_prefix + 'redis-2.2.8' + pipe;
+        command = command_prefix + 'redis-2.2.8';
         break;
       // match imagick
       case /^imagick$/.test(extension):
@@ -93,7 +108,7 @@ export async function addExtensionDarwin(
       // match sqlite
       case /^sqlite$/.test(extension):
         extension = 'sqlite3';
-        command = command_prefix + extension + pipe;
+        command = command_prefix + extension;
         break;
       // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
       case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
@@ -106,7 +121,7 @@ export async function addExtensionDarwin(
           version;
         return;
       default:
-        command = command_prefix + extension + pipe;
+        command = command_prefix + extension;
         break;
     }
     add_script +=
@@ -283,10 +298,20 @@ export async function addExtensionLinux(
           ' ' +
           version;
         return;
+      // match 7.2xdebug3..7.4xdebug3
+      case /^7\.[2-4]xdebug3$/.test(version_extension):
+        add_script +=
+          '\nadd_extension_from_source xdebug xdebug/xdebug master --enable-xdebug zend_extension';
+        return;
+      // match 8.0xdebug3
+      case /^8\.[0-9]xdebug3$/.test(version_extension):
+        extension = 'xdebug';
+        command = command_prefix + version + '-' + extension + pipe;
+        break;
       // match 7.1xdebug..7.4xdebug
       case /^7\.[1-4]xdebug$/.test(version_extension):
         add_script +=
-          '\nupdate_extension xdebug 2.9.3' +
+          '\nupdate_extension xdebug 2.9.6' +
           pipe +
           '\n' +
           (await utils.addLog('$tick', 'xdebug', 'Enabled', 'linux'));

src/scripts/darwin.sh

@@ -91,6 +91,16 @@ add_pecl_extension() {
   fi
 }
 
+# Function to install a php extension from shivammathur/extensions tap.
+add_brew_extension() {
+  extension=$1
+  if ! brew tap | grep shivammathur/extensions; then
+    brew tap --shallow shivammathur/extensions
+  fi
+  brew install "$extension@$version"
+  sudo cp "$(brew --prefix)/opt/$extension@$version/$extension.so" "$ext_dir"
+}
+
 # Function to setup extensions
 add_extension() {
   extension=$1
@@ -172,7 +182,7 @@ add_composertool() {
 
 add_blackfire() {
   sudo mkdir -p usr/local/var/run
-  brew tap blackfireio/homebrew-blackfire >/dev/null 2>&1
+  brew tap --shallow blackfireio/homebrew-blackfire >/dev/null 2>&1
   brew install blackfire-agent >/dev/null 2>&1
   if [[ -n $BLACKFIRE_SERVER_ID ]] && [[ -n $BLACKFIRE_SERVER_TOKEN ]]; then
     sudo blackfire-agent --register --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN" >/dev/null 2>&1
@@ -198,25 +208,14 @@ add_pecl() {
   add_log "$tick" "PECL" "Added"
 }
 
-# Function to fetch updated formulae.
-update_formulae() {
-  brew_dir=$(brew --prefix)/Homebrew/Library/Taps/homebrew/homebrew-core/Formula
-  for formula in httpd pkg-config apr apr-util argon2 aspell autoconf bison curl-openssl freetds freetype gettext glib gmp icu4c jpeg krb5 libffi libpng libpq libsodium libzip oniguruma openldap openssl@1.1 re2c sqlite tidyp unixodbc webp; do
-    sudo curl -o "$brew_dir"/"$formula".rb -sSL https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/"$formula".rb &
-    to_wait+=( $! )
-  done
-  wait "${to_wait[@]}"
-}
-
 # Function to setup PHP 5.6 and newer.
 setup_php() {
   action=$1
   export HOMEBREW_NO_INSTALL_CLEANUP=TRUE
-  brew tap shivammathur/homebrew-php
+  brew tap --shallow shivammathur/homebrew-php
   if brew list php@"$version" 2>/dev/null | grep -q "Error" && [ "$action" != "upgrade" ]; then
     brew unlink php@"$version"
   else
-    if [ "$version" = "$master_version" ]; then update_formulae; fi
     brew "$action" shivammathur/php/php@"$version"
   fi
   brew link --force --overwrite php@"$version"
@@ -227,7 +226,6 @@ tick="✓"
 cross="✗"
 version=$1
 nodot_version=${1/./}
-master_version="8.0"
 old_versions="5.[3-5]"
 tool_path_dir="/usr/local/bin"
 existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)

src/scripts/linux.sh

@@ -18,6 +18,7 @@ add_log() {
 
 # Function to read env inputs.
 read_env() {
+  . /etc/lsb-release
   [[ -z "${update}" ]] && update='false' && UPDATE='false' || update="${update}"
   [ "$update" = false ] && [[ -n ${UPDATE} ]] && update="${UPDATE}"
   [[ -z "${runner}" ]] && runner='github' && RUNNER='github' || runner="${runner}"
@@ -32,19 +33,24 @@ update_lists() {
   fi
 }
 
+# Function to add ppa:ondrej/php.
+add_ppa() {
+  if ! apt-cache policy | grep -q ondrej/php; then
+    LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y
+    if [ "$DISTRIB_RELEASE" = "16.04" ]; then
+      sudo "$debconf_fix" apt-get update
+    fi
+  fi
+}
+
 # Function to setup environment for self-hosted runners.
 self_hosted_setup() {
   echo "Set disable_coredump false" | sudo tee -a /etc/sudo.conf
   if ! command -v apt-fast >/dev/null; then
     sudo ln -sf /usr/bin/apt-get /usr/bin/apt-fast
   fi
-  update_lists && $apt_install curl make lsb-release software-properties-common unzip
+  update_lists && $apt_install curl make software-properties-common unzip
-  if ! apt-cache policy | grep -q ondrej/php; then
+  add_ppa
-    LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y
-    if [ "$(lsb_release -r -s)" = "16.04" ]; then
-      sudo "$debconf_fix" apt-get update
-    fi
-  fi
 }
 
 # Function to configure PECL.
@@ -120,7 +126,8 @@ add_pdo_extension() {
     add_log "$tick" "$pdo_ext" "Enabled"
   else
     read -r ext ext_name <<< "$1 $1"
-    sudo rm -rf "$scan_dir"/*pdo.ini >/dev/null 2>&1 && echo "extension=pdo.so" >> "$ini_file"
+    sudo rm -rf "$scan_dir"/*pdo.ini >/dev/null 2>&1
+    if ! check_extension "pdo"; then echo "extension=pdo.so" >> "$ini_file"; fi
     if [ "$ext" = "mysql" ]; then
       enable_extension "mysqlnd" "extension"
       ext_name="mysqli"
@@ -200,6 +207,27 @@ update_extension() {
   fi
 }
 
+# Function to install extension from source
+add_extension_from_source() {
+  extension=$1
+  repo=$2
+  release=$3
+  args=$4
+  prefix=$5
+  (
+    add_devtools
+    delete_extension "$extension"
+    curl -o /tmp/"$extension".tar.gz -sSL https://github.com/"$repo"/archive/"$release".tar.gz
+    tar xf /tmp/"$extension".tar.gz -C /tmp
+    cd /tmp/"$extension-$release" || exit 1
+    phpize  && ./configure "$args" && make && sudo make install
+    enable_extension "$extension" "$prefix"
+  ) >/dev/null 2>&1
+  (
+    check_extension "$extension" && add_log "$tick" "$extension" "Installed and enabled"
+  ) || add_log "$cross" "$extension" "Could not install $extension-$release on PHP $semver"
+}
+
 # Function to setup a remote tool.
 add_tool() {
   url=$1
@@ -371,6 +399,8 @@ if [ "$runner" = "self-hosted" ]; then
   else
     self_hosted_setup >/dev/null 2>&1
   fi
+elif [ "$DISTRIB_RELEASE" = "20.04" ]; then
+  add_ppa >/dev/null 2>&1
 fi
 
 # Setup PHP

src/scripts/win32.ps1

@@ -362,7 +362,8 @@ if($version -lt "5.5") {
 }
 Update-PhpCAInfo -Path $php_dir -Source $cert_source
 if ($version -eq 'master') {
-  Copy-Item $dir"\..\src\bin\php_$env:PHPTS`_pcov.dll" -Destination $ext_dir"\php_pcov.dll"
+  Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/shivammathur/php-extensions-windows/releases/latest/download/php_$env:phpts`_$arch`_pcov.dll" -OutFile $ext_dir"\php_pcov.dll" >$null 2>&1
+  Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/shivammathur/php-extensions-windows/releases/latest/download/php_$env:phpts`_$arch`_xdebug.dll" -OutFile $ext_dir"\php_xdebug.dll" >$null 2>&1
   Set-PhpIniKey -Key 'opcache.jit_buffer_size' -Value '256M' -Path $php_dir
   Set-PhpIniKey -Key 'opcache.jit' -Value '1235' -Path $php_dir
 }

src/tools.ts

@@ -358,7 +358,7 @@ export async function getCleanedToolsList(
       return extension
         .trim()
         .replace(
-          /symfony\/|laravel\/|robmorgan\/|hirak\/|narrowspark\/automatic-/,
+          /hirak\/|laravel\/|narrowspark\/automatic-|overtrue\/|robmorgan\/|symfony\//,
           ''
         );
     })
@@ -539,6 +539,9 @@ export async function addTools(
       case 'phinx':
         script += await addPackage(tool, release, 'robmorgan/', os_version);
         break;
+      case 'phplint':
+        script += await addPackage(tool, release, 'overtrue/', os_version);
+        break;
       case 'prestissimo':
         script += await addPackage(tool, release, 'hirak/', os_version);
         break;

src/utils.ts

@@ -224,13 +224,17 @@ export async function CSVArray(values_csv: string): Promise<Array<string>> {
  * @param extension
  */
 export async function getExtensionPrefix(extension: string): Promise<string> {
-  const zend: Array<string> = ['xdebug', 'opcache', 'ioncube', 'eaccelerator'];
+  const zend: Array<string> = [
+    'xdebug',
+    'xdebug3',
+    'opcache',
+    'ioncube',
+    'eaccelerator'
+  ];
   switch (zend.indexOf(extension)) {
-    case 0:
+    default:
-    case 1:
       return 'zend_extension';
     case -1:
-    default:
       return 'extension';
   }
 }