Use packages from shivammathur/php-ubuntu

Update dependencies

Update prettier plugin in .eslintrc.json

.eslintrc.json

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

.github/workflows/node-workflow.yml

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

README.md

@@ -58,12 +58,12 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
 
 |Virtual environment|YAML workflow label|Pre-installed PHP|
 |--- |--- |--- |
-|Ubuntu 16.04|`ubuntu-16.04`|`PHP 5.6` to `PHP 7.4`|
-|Ubuntu 18.04|`ubuntu-latest` or `ubuntu-18.04`|`PHP 7.1` to `PHP 7.4`|
-|Ubuntu 20.04|`ubuntu-20.04`|`PHP 7.4`|
-|Windows Server 2019|`windows-latest` or `windows-2019`|`PHP 7.4`|
-|macOS 10.15 Catalina|`macos-latest` or `macos-10.15`|`PHP 7.4`|
-|macOS 11.0 Big Sur|`macos-11.0`|`PHP 7.4`|
+|Ubuntu 16.04|`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 10.15 Catalina|`macos-latest` or `macos-10.15`|`PHP 8.0`|
+|macOS 11.0 Big Sur|`macos-11.0`|`PHP 8.0`|
 
 
 ## :heavy_plus_sign: PHP Extension Support
@@ -219,7 +219,6 @@ jobs:
 
 > Setup a nightly build of `PHP 8.0.0-dev` from the [master branch](https://github.com/php/php-src/tree/master "Master branch on PHP source repository") of PHP.
 
-- `PECL` is installed by default with this version on `Ubuntu` and `macOS`.
 - Some extensions might not support this version currently.
 - Refer to this [RFC](https://wiki.php.net/rfc/jit "PHP JIT RFC configuration") for configuring `PHP JIT` on this version.
 - Refer to this [list of RFCs](https://wiki.php.net/rfc#php_80 "List of RFCs implemented in PHP8") implemented in this version.
@@ -418,10 +417,32 @@ Contributions are welcome! See [Contributor's Guide](.github/CONTRIBUTING.md "sh
 
 ## :sparkling_heart: Support This Project
 
-If this action helped you.
+- If setup-php saved your developer time, please consider sponsoring setup-php:
+  - [Open Collective](https://opencollective.com/setup-php "setup-php Open Collective")
+  - [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal")
+  - [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon")
+- Please [reach out](mailto:contact@setup-php.com) if you have any questions regarding sponsoring setup-php.
+- Please star the project and share it. If you blog, please share your experience of using this action.
 
-- Sponsor the project by subscribing on [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon") or by contributing using [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal"). This project is also available as part of the [Tidelift Subscription](https://tidelift.com/subscription/pkg/npm-setup-php?utm_source=npm-setup-php&utm_medium=referral&utm_campaign=enterprise&utm_term=repo "Tidelift Subscription for setup-php") to support delivering enterprise-level maintenance.
-- Please star the project and dependencies. If you blog, please share your experience of using this action with the community.
+*Huge thanks to the following companies for supporting `setup-php`*
+
+<p>
+  <a href="https://www.jetbrains.com/?from=setup-php">
+    <img src="https://setup-php.com/sponsors/jetbrains.svg" alt="JetBrains" width="106" height="60">
+  </a>
+  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+  <a href="https://blackfire.io/?utm_source=setup-php">
+    <img src="https://setup-php.com/sponsors//blackfire.svg" alt="Blackfire" width="212" height="60">
+  </a>
+  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+  <a href="https://www.macstadium.com/?source=setup-php">
+    <img src="https://setup-php.com/sponsors//macstadium.png" alt="Mac Stadium" width="148" height="60">
+  </a>
+  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+  <a href="https://tidelift.com/subscription/pkg/npm-setup-php">
+    <img src="https://setup-php.com/sponsors//tidelift.png" alt="Tidelift" width="70" height="60">
+  </a>  
+</p>
 
 ## :bookmark: Dependencies
 

__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');
@@ -27,24 +21,38 @@ describe('Config tests', () => {
 
   it('checking addCoverage with PCOV on darwin', async () => {
     const darwin: string = await coverage.addCoverage('pcov', '7.4', 'darwin');
-    expect(darwin).toContain('add_extension pcov');
+    expect(darwin).toContain('add_brew_extension pcov');
     expect(darwin).toContain('remove_extension xdebug');
   });
 
   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 linux', async () => {
-    const linux: string = await coverage.addCoverage('xdebug', '7.4', 'linux');
-    expect(linux).toContain('add_extension xdebug');
+  it('checking addCoverage with Xdebug3 on windows', async () => {
+    const win32: string = await coverage.addCoverage('xdebug3', '7.4', 'win32');
+    expect(win32).toContain('Add-Extension xdebug');
+  });
+
+  it('checking addCoverage with Xdebug2 on windows', async () => {
+    const win32: string = await coverage.addCoverage('xdebug2', '7.4', 'win32');
+    expect(win32).toContain('Add-Extension xdebug stable 2.9.8');
   });
 
   it('checking addCoverage with Xdebug on linux', async () => {
     const linux: string = await coverage.addCoverage('xdebug', '8.0', 'linux');
     expect(linux).toContain('add_extension xdebug');
-    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');
+  });
+
+  it('checking addCoverage with Xdebug2 on linux', async () => {
+    const linux: string = await coverage.addCoverage('xdebug2', '7.4', 'linux');
+    expect(linux).toContain('add_pecl_extension xdebug 2.9.8 zend_extension');
   });
 
   it('checking addCoverage with Xdebug on darwin', async () => {
@@ -53,7 +61,25 @@ describe('Config tests', () => {
       '7.4',
       'darwin'
     );
-    expect(darwin).toContain('add_extension xdebug');
+    expect(darwin).toContain('add_brew_extension xdebug');
+  });
+
+  it('checking addCoverage with Xdebug3 on darwin', async () => {
+    const darwin: string = await coverage.addCoverage(
+      'xdebug3',
+      '7.4',
+      'darwin'
+    );
+    expect(darwin).toContain('add_brew_extension xdebug');
+  });
+
+  it('checking addCoverage with Xdebug2 on darwin', async () => {
+    const darwin: string = await coverage.addCoverage(
+      'xdebug2',
+      '7.4',
+      'darwin'
+    );
+    expect(darwin).toContain('add_brew_extension xdebug2');
   });
 
   it('checking disableCoverage windows', async () => {

__tests__/extensions.test.ts

@@ -13,7 +13,7 @@ describe('Extension tests', () => {
     expect(win32).toContain('phalcon.ps1 phalcon4');
     expect(win32).toContain('Add-Extension ast beta');
 
-    win32 = await extensions.addExtension('xdebug', '7.2', 'win32');
+    win32 = await extensions.addExtension('xdebug2', '7.2', 'win32');
     expect(win32).toContain('Add-Extension xdebug stable 2.9.8');
 
     win32 = await extensions.addExtension('mysql', '7.4', 'win32');
@@ -71,7 +71,7 @@ describe('Extension tests', () => {
     linux = await extensions.addExtension('gearman', '7.4', 'linux');
     expect(linux).toContain('gearman.sh 7.4');
 
-    linux = await extensions.addExtension('xdebug', '7.2', 'linux');
+    linux = await extensions.addExtension('xdebug2', '7.2', 'linux');
     expect(linux).toContain('add_pecl_extension xdebug 2.9.8 zend_extension');
 
     linux = await extensions.addExtension('xdebug', '7.2', 'openbsd');
@@ -116,14 +116,8 @@ describe('Extension tests', () => {
     darwin = await extensions.addExtension('xdebug', '7.0', 'darwin');
     expect(darwin).toContain('add_brew_extension xdebug');
 
-    darwin = await extensions.addExtension('xdebug', '7.2', 'darwin');
-    expect(darwin).toContain('add_brew_extension xdebug');
-
-    darwin = await extensions.addExtension('redis', '5.6', 'darwin');
-    expect(darwin).toContain('pecl_install redis-2.2.8');
-
-    darwin = await extensions.addExtension('redis', '7.2', 'darwin');
-    expect(darwin).toContain('pecl_install redis');
+    darwin = await extensions.addExtension('xdebug2', '7.2', 'darwin');
+    expect(darwin).toContain('add_brew_extension xdebug2');
 
     darwin = await extensions.addExtension(
       'does_not_exist',

__tests__/tools.test.ts

@@ -112,102 +112,20 @@ describe('Tools tests', () => {
     ).toBe('releases/download/v1.2.3/tool.phar');
   });
 
-  it('checking getCodeceptionUriBuilder', async () => {
-    expect(await tools.getCodeceptionUriBuilder('3.2.1', 'php56')).toBe(
-      'releases/3.2.1/php56/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUriBuilder('3.2.1', 'php54')).toBe(
-      'releases/3.2.1/php54/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUriBuilder('3.2.1', '')).toBe(
-      'releases/3.2.1/codecept.phar'
-    );
-  });
-
-  it('checking getCodeceptionUri', async () => {
-    expect(await tools.getCodeceptionUri('latest', '5.6')).toBe(
-      'php56/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('latest', '7.0')).toBe(
-      'php56/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('latest', '7.1')).toBe(
-      'php56/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('latest', '7.2')).toBe(
-      'codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('latest', '7.3')).toBe(
-      'codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('latest', '7.4')).toBe(
-      'codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('4.0.0', '7.4')).toBe(
-      'releases/4.0.0/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('4.0.0', '5.6')).toBe(
-      'releases/4.0.0/php56/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('4.0.0', '7.1')).toBe(
-      'releases/4.0.0/php56/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('3.1.0', '7.4')).toBe(
-      'releases/3.1.0/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('3.1.0', '5.6')).toBe(
-      'releases/3.1.0/php54/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.5.4', '7.4')).toBe(
-      'releases/2.5.4/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.5.4', '5.6')).toBe(
-      'releases/2.5.4/php54/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.3.4', '7.4')).toBe(
-      'releases/2.3.4/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.3.4', '5.4')).toBe(
-      'releases/2.3.4/php54/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.2.4', '5.6')).toBe(
-      'releases/2.2.4/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.2.4', '7.4')).toBe(
-      'releases/2.2.4/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.2.4', '5.4')).toBe(
-      'releases/2.2.4/php54/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.1.7', '5.6')).toBe(
-      'releases/2.1.7/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.1.7', '5.4')).toBe(
-      'releases/2.1.7/php54/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.1.5', '5.4')).toBe(
-      'releases/2.1.5/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('2.1.5', '7.4')).toBe(
-      'releases/2.1.5/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('1.6.9', '7.4')).toBe(
-      'releases/1.6.9/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUri('1.5.0', '7.4')).toBe(
-      'releases/1.5.0/codecept.phar'
-    );
-  });
-
   it('checking addPhive', async () => {
-    let script: string = await tools.addPhive('1.2.3', 'linux');
+    let script: string = await tools.addPhive('1.2.3', '7.4', 'linux');
     expect(script).toContain(
       'add_tool https://github.com/phar-io/phive/releases/download/1.2.3/phive-1.2.3.phar phive'
     );
 
-    script = await tools.addPhive('latest', 'win32');
+    script = await tools.addPhive('latest', '5.6', 'win32');
     expect(script).toContain(
-      'Add-Tool https://phar.io/releases/phive.phar phive'
+      'Add-Tool https://github.com/phar-io/phive/releases/download/0.12.1/phive-0.12.1.phar phive'
+    );
+
+    script = await tools.addPhive('latest', '7.1', 'win32');
+    expect(script).toContain(
+      'Add-Tool https://github.com/phar-io/phive/releases/download/0.13.5/phive-0.13.5.phar phive'
     );
   });
 
@@ -490,7 +408,7 @@ describe('Tools tests', () => {
   });
   it('checking addTools on windows', async () => {
     const script: string = await tools.addTools(
-      'codeception, cs2pr, deployer, phpmd, phinx, phive:0.13.2, php-config, phpize, symfony, does_not_exist, composer',
+      'cs2pr, deployer, phpmd, phinx, phive:0.13.2, php-config, phpize, symfony, does_not_exist, composer',
       '7.4',
       'win32'
     );
@@ -519,7 +437,7 @@ describe('Tools tests', () => {
   });
   it('checking addTools with composer tool using user/tool as input', async () => {
     const script: string = await tools.addTools(
-      'hirak/prestissimo, narrowspark/automatic-composer-prefetcher, robmorgan/phinx',
+      'codeception/codeception, hirak/prestissimo, narrowspark/automatic-composer-prefetcher, robmorgan/phinx',
       '7.4',
       'win32'
     );

__tests__/utils.test.ts

@@ -8,6 +8,12 @@ jest.mock('@actions/core', () => ({
   })
 }));
 
+jest.spyOn(utils, 'fetch').mockImplementation(
+  async (url): Promise<string> => {
+    return `{ "latest": "8.0", "5.x": "5.6", "url": "${url}" }`;
+  }
+);
+
 async function cleanup(path: string): Promise<void> {
   fs.unlink(path, error => {
     if (error) {
@@ -32,6 +38,20 @@ describe('Utils tests', () => {
     }).rejects.toThrow('Input required and not supplied: DoesNotExist');
   });
 
+  it('checking fetch', async () => {
+    expect(await utils.fetch('test_url')).toBe(
+      '{ "latest": "8.0", "5.x": "5.6", "url": "test_url" }'
+    );
+  });
+
+  it('checking parseVersion', async () => {
+    expect(await utils.parseVersion('latest')).toBe('8.0');
+    expect(await utils.parseVersion('7')).toBe('7.0');
+    expect(await utils.parseVersion('7.4')).toBe('7.4');
+    expect(await utils.parseVersion('5.x')).toBe('5.6');
+    expect(await utils.parseVersion('4.x')).toBe(undefined);
+  });
+
   it('checking asyncForEach', async () => {
     const array: Array<string> = ['a', 'b', 'c'];
     let concat = '';
@@ -77,12 +97,9 @@ describe('Utils tests', () => {
     const runner_dir: string = process.env['RUNNER_TOOL_CACHE'] || '';
     const script_path: string = path.join(runner_dir, 'test.sh');
     await utils.writeScript('test.sh', testString);
-    await fs.readFile(
-      script_path,
-      function (error: Error | null, data: Buffer) {
+    fs.readFile(script_path, function (error: Error | null, data: Buffer) {
       expect(testString).toBe(data.toString());
-      }
-    );
+    });
     await cleanup(script_path);
   });
 
@@ -104,6 +121,28 @@ describe('Utils tests', () => {
       'b=2',
       'c=3'
     ]);
+    expect(await utils.CSVArray('\'a=1,2\', "b=3, 4", c=5, d=~e~')).toEqual([
+      'a=1,2',
+      'b=3, 4',
+      'c=5',
+      "d='~e~'"
+    ]);
+    expect(await utils.CSVArray('a=\'1,2\', b="3, 4", c=5')).toEqual([
+      'a=1,2',
+      'b=3, 4',
+      'c=5'
+    ]);
+    expect(await utils.CSVArray('\'a=1,2\', "b=3, 4", c=5, d=~e~')).toEqual([
+      'a=1,2',
+      'b=3, 4',
+      'c=5',
+      "d='~e~'"
+    ]);
+    expect(await utils.CSVArray('a=\'1,2\', b="3, 4", c=5')).toEqual([
+      'a=1,2',
+      'b=3, 4',
+      'c=5'
+    ]);
     expect(await utils.CSVArray('')).toEqual([]);
     expect(await utils.CSVArray(' ')).toEqual([]);
   });

examples/symfony-mysql.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite, mysql
@@ -43,10 +43,11 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
         run: |
+          composer require --dev symfony/orm-pack symfony/phpunit-bridge
           composer install --no-progress --prefer-dist --optimize-autoloader
+          php bin/phpunit install
       - name: Run Migration
         run: |
-          composer require symfony/orm-pack
           php bin/console doctrine:schema:update --force || echo "No migrations found or schema update failed"
           php bin/console doctrine:migrations:migrate || echo "No migrations found or migration failed"
         env:

examples/symfony-postgres.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite, pgsql
@@ -41,10 +41,11 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
         run: |
+          composer require --dev symfony/orm-pack symfony/phpunit-bridge
           composer install --no-progress --prefer-dist --optimize-autoloader
+          php bin/phpunit install
       - name: Run Migration
         run: |
-          composer require symfony/orm-pack
           php bin/console doctrine:schema:update --force || echo "No migrations found or schema update failed"
           php bin/console doctrine:migrations:migrate || echo "No migrations found or migration failed"
         env:

examples/symfony.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite
@@ -32,7 +32,8 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
         run: |
-          composer require symfony/orm-pack
+          composer require --dev symfony/phpunit-bridge
           composer install --no-progress --prefer-dist --optimize-autoloader
+          php bin/phpunit install
       - name: Run Tests
         run: php bin/phpunit --coverage-text

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "dist/index.js",
@@ -30,27 +30,27 @@
     "fs": "0.0.1-security"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.15",
-    "@types/node": "^14.14.7",
-    "@typescript-eslint/eslint-plugin": "^4.7.0",
-    "@typescript-eslint/parser": "^4.7.0",
-    "@zeit/ncc": "^0.22.3",
-    "eslint": "^7.13.0",
-    "eslint-config-prettier": "^6.15.0",
+    "@types/jest": "^26.0.20",
+    "@types/node": "^14.14.31",
+    "@typescript-eslint/eslint-plugin": "^4.15.1",
+    "@typescript-eslint/parser": "^4.15.1",
+    "@vercel/ncc": "^0.27.0",
+    "eslint": "^7.20.0",
+    "eslint-config-prettier": "^8.0.0",
     "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jest": "^24.1.3",
-    "eslint-plugin-prettier": "^3.1.4",
-    "husky": "^4.3.0",
+    "eslint-plugin-jest": "^24.1.5",
+    "eslint-plugin-prettier": "^3.3.1",
+    "husky": "^4.3.8",
     "jest": "^26.6.3",
     "jest-circus": "^26.6.3",
-    "prettier": "^2.1.2",
-    "ts-jest": "^26.4.4",
-    "typescript": "^4.0.5"
+    "prettier": "^2.2.1",
+    "ts-jest": "^26.5.1",
+    "typescript": "^4.1.5"
   },
   "husky": {
     "skipCI": true,
     "hooks": {
-      "pre-commit": "npm run format && npm run lint && npm run build && npm run release"
+      "pre-commit": "npm run format && npm run lint && npm run test && npm run build && npm run release"
     }
   }
 }

src/config.ts

@@ -14,7 +14,9 @@ export async function addINIValuesUnix(
     script +=
       (await utils.addLog('$tick', line, 'Added to php.ini', 'linux')) + '\n';
   });
-  return 'echo "' + ini_values.join('\n') + '" >> $ini_file' + script;
+  return (
+    'echo "' + ini_values.join('\n') + '" >> ${pecl_file:-$ini_file}' + script
+  );
 }
 
 /**

src/configs/php-versions.json

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

src/coverage.ts

@@ -2,32 +2,22 @@ import * as utils from './utils';
 import * as extensions from './extensions';
 import * as config from './config';
 
-/**
- * Function to setup Xdebug
- *
- * @param version
- * @param os_version
- * @param pipe
- */
 export async function addCoverageXdebug(
+  extension: string,
   version: string,
   os_version: string,
   pipe: string
 ): Promise<string> {
   const xdebug =
-    (await extensions.addExtension('xdebug', version, os_version, true)) + pipe;
-  const ini = await config.addINIValues(
-    'xdebug.mode=coverage',
-    os_version,
-    true
-  );
+    (await extensions.addExtension(extension, version, os_version, true)) +
+    pipe;
   const log = await utils.addLog(
     '$tick',
-    'xdebug',
+    extension,
     'Xdebug enabled as coverage driver',
     os_version
   );
-  return xdebug + '\n' + ini + '\n' + log;
+  return xdebug + '\n' + log;
 }
 
 /**
@@ -140,7 +130,14 @@ 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('xdebug', version, os_version, pipe))
+      );
+    case 'xdebug2':
+      return (
+        script + (await addCoverageXdebug('xdebug2', version, os_version, pipe))
+      );
     case 'none':
       return script + (await disableCoverage(version, os_version, pipe));
     default:

src/extensions.ts

@@ -21,7 +21,7 @@ export async function addExtensionDarwin(
     let command = '';
     switch (true) {
       // match pre-release versions
-      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
+      case /.+-(beta|alpha|devel|snapshot)/.test(extension):
         script +=
           '\nadd_unstable_extension ' +
           extension_name +
@@ -30,19 +30,13 @@ export async function addExtensionDarwin(
           ' ' +
           ext_prefix;
         return;
-      // match 5.6xdebug to 8.0xdebug, 5.6igbinary to 8.0igbinary
-      // match 5.6grpc to 7.4grpc, 5.6imagick to 7.4imagick, 5.6protobuf to 7.4protobuf, 5.6swoole to 7.4swoole
+      // match 5.6 to 8.0 amqp, grpc, igbinary, imagick, imap, msgpack, pecl_http, propro, protobuf, raphf, redis, swoole, xdebug, xdebug2, zmq
       // match 7.1pcov to 8.0pcov
-      case /(5\.6|7\.[0-4]|8\.0)(xdebug|igbinary)/.test(version_extension):
-      case /(5\.6|7\.[0-4])(grpc|imagick|protobuf|swoole)/.test(
+      case /(5\.6|7\.[0-4]|8.0)(amqp|grpc|igbinary|imagick|imap|msgpack|^(pecl_)?http$|propro|protobuf|raphf|redis|swoole|xdebug|xdebug2|zmq)/.test(
         version_extension
       ):
       case /(7\.[1-4]|8\.0])pcov/.test(version_extension):
-        command = 'add_brew_extension ' + extension_name;
-        break;
-      // match 5.6redis
-      case /5\.6redis/.test(version_extension):
-        command = command_prefix + 'redis-2.2.8';
+        command = 'add_brew_extension ' + extension_name.replace('pecl_', '');
         break;
       // match sqlite
       case /^sqlite$/.test(extension):
@@ -91,7 +85,7 @@ export async function addExtensionWindows(
     const version_extension: string = version + extension;
     switch (true) {
       // match pre-release versions
-      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
+      case /.+-(beta|alpha|devel|snapshot)/.test(extension):
         script += '\nAdd-Extension ' + extension_name + ' ' + stability;
         break;
       // match 5.6mysql, 5.6mysqli, 5.6mysqlnd
@@ -99,8 +93,8 @@ export async function addExtensionWindows(
         script +=
           '\nAdd-Extension mysql\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
         break;
-      // match 7.2xdebug
-      case /7\.2xdebug/.test(version_extension):
+      // match 7.2xdebug2 to 7.4xdebug2
+      case /7\.[2-4]xdebug2/.test(version_extension):
         script += '\nAdd-Extension xdebug stable 2.9.8';
         break;
       // match 7.0mysql..8.0mysql
@@ -155,7 +149,7 @@ export async function addExtensionLinux(
     let command = '';
     switch (true) {
       // match pre-release versions
-      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
+      case /.+-(beta|alpha|devel|snapshot)/.test(extension):
         script +=
           '\nadd_unstable_extension ' +
           extension_name +
@@ -183,8 +177,8 @@ export async function addExtensionLinux(
           ' ' +
           version;
         return;
-      // match 7.2xdebug
-      case /^7\.2xdebug$/.test(version_extension):
+      // match 7.2xdebug2 to 7.4xdebug2
+      case /^7\.[2-4]xdebug2$/.test(version_extension):
         script += '\nadd_pecl_extension xdebug 2.9.8 ' + ext_prefix;
         return;
       // match sqlite

src/install.ts

@@ -29,14 +29,7 @@ export async function build(
     (await utils.getInput('ini-values', false)) ||
     (await utils.getInput('ini-values-csv', false));
   const coverage_driver: string = await utils.getInput('coverage', false);
-  const pecl: string = await utils.getInput('pecl', false);
-  let tools_csv: string = await utils.getInput('tools', false);
-  if (
-    pecl == 'true' ||
-    /.*-(beta|alpha|devel|snapshot).*/.test(extension_csv)
-  ) {
-    tools_csv = 'pecl, ' + tools_csv;
-  }
+  const tools_csv: string = await utils.getInput('tools', false);
 
   let script: string = await utils.readScript(filename);
   script += await tools.addTools(tools_csv, version, os_version);
@@ -65,15 +58,17 @@ export async function run(): Promise<void> {
     core.warning(
       'setup-php v1 is deprecated.\nPlease upgrade to v2 - https://github.com/shivammathur/setup-php/wiki/Switch-to-v2'
     );
-    const os_version: string = process.platform;
-    let version: string = await utils.getInput('php-version', true);
-    version = version.length > 1 ? version.slice(0, 3) : version + '.0';
+    const version: string = await utils.parseVersion(
+      await utils.getInput('php-version', true)
+    );
     if (version == '8.1') {
       core.setFailed(
         'PHP 8.1 is not supported on setup-php v1.\nPlease upgrade to v2 - https://github.com/shivammathur/setup-php/wiki/Switch-to-v2'
       );
       return;
     }
+    if (version) {
+      const os_version: string = process.platform;
       // check the os version and run the respective script
       let script_path = '';
       switch (os_version) {
@@ -87,6 +82,9 @@ export async function run(): Promise<void> {
           await exec('pwsh ' + script_path + ' ' + version + ' ' + __dirname);
           break;
       }
+    } else {
+      core.setFailed('Unable to get the PHP version');
+    }
   } catch (error) {
     core.setFailed(error.message);
   }

src/scripts/darwin.sh

@@ -77,16 +77,38 @@ add_pecl_extension() {
   fi
 }
 
+# Function to fetch a brew tap
+fetch_brew_tap() {
+  tap=$1
+  tap_user=$(dirname "$tap")
+  tap_name=$(basename "$tap")
+  mkdir -p "$tap_dir/$tap_user"
+  sudo curl "${curl_opts[@]}" "https://github.com/$tap/archive/master.tar.gz" | sudo tar -xzf - -C "$tap_dir/$tap_user"
+  if [ -d "$tap_dir/$tap_user/$tap_name-master" ]; then
+    sudo mv "$tap_dir/$tap_user/$tap_name-master" "$tap_dir/$tap_user/$tap_name"
+  fi
+}
+
+# Function to add a brew tap.
+add_brew_tap() {
+  tap=$1
+  if ! [ -d "$tap_dir/$tap" ]; then
+    fetch_brew_tap "$tap" >/dev/null 2>&1
+    if ! [ -d "$tap_dir/$tap" ]; then
+      brew tap --shallow "$tap" >/dev/null 2>&1
+    fi
+  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
-  tap_dir="$(brew --prefix)/Homebrew/Library/Taps"
-  sudo mv "$tap_dir"/shivammathur/homebrew-extensions/.github/deps/"$extension"/* "$tap_dir/homebrew/homebrew-core/Formula/" 2>/dev/null || true
-  brew install "$extension@$version"
-  sudo cp "$(brew --prefix)/opt/$extension@$version/$extension.so" "$ext_dir"
+  formula=$1
+  extension=${formula//[0-9]/}
+  add_brew_tap shivammathur/homebrew-php
+  add_brew_tap shivammathur/homebrew-extensions
+  sudo mv "$tap_dir"/shivammathur/homebrew-extensions/.github/deps/"$formula"/* "$tap_dir/homebrew/homebrew-core/Formula/" 2>/dev/null || true
+  brew install "$formula@$version"
+  sudo cp "$brew_prefix/opt/$formula@$version/$extension.so" "$ext_dir"
 }
 
 # Function to setup extensions
@@ -125,10 +147,14 @@ configure_composer() {
     add_log "$cross" "composer" "Could not download composer"
     exit 1;
   fi
-  composer -q global config process-timeout 0
+  if ! [ -e "$composer_json" ]; then
+    echo '{}' | tee "$composer_json" >/dev/null 2>&1
+    sudo chmod 644 "$composer_json"
+  fi
+  composer -q config -g process-timeout 0
   echo "$composer_bin" >> "$GITHUB_PATH"
   if [ -n "$COMPOSER_TOKEN" ]; then
-    composer -q global config github-oauth.github.com "$COMPOSER_TOKEN"
+    composer -q config -g github-oauth.github.com "$COMPOSER_TOKEN"
   fi
 }
 
@@ -148,7 +174,7 @@ add_tool() {
     status_code=$(sudo curl -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "$url")
   fi
   if [ "$status_code" != "200" ] && [[ "$url" =~ .*github.com.*releases.*latest.* ]]; then
-    url=$(echo $url | sed -e "s|releases/latest/download|releases/download/$(curl "${curl_opts[@]}" "$(echo "$url" | cut -d '/' -f '1-5')/releases" | grep -Eo -m 1 "([0-9]+\.[0-9]+\.[0-9]+)/$(echo "$url" | sed -e "s/.*\///")" | cut -d '/' -f 1)|")
+    url="${url//releases\/latest\/download/releases/download/$(curl "${curl_opts[@]}" "$(echo "$url" | cut -d '/' -f '1-5')/releases" | grep -Eo -m 1 "([0-9]+\.[0-9]+\.[0-9]+)/$(echo "$url" | sed -e "s/.*\///")" | cut -d '/' -f 1)}"
     status_code=$(sudo curl -w "%{http_code}" -o "$tool_path" "${curl_opts[@]}" "$url")
   fi
   if [ "$status_code" = "200" ]; then
@@ -179,19 +205,22 @@ add_composertool() {
   release=$2
   prefix=$3
   (
+    sudo rm -f "$composer_lock" >/dev/null 2>&1 || true
     composer global require "$prefix$release" >/dev/null 2>&1 &&
     add_log "$tick" "$tool" "Added"
   ) || add_log "$cross" "$tool" "Could not setup $tool"
   if [ -e "$composer_bin/composer" ]; then
     sudo cp -p "$tool_path_dir/composer" "$composer_bin"
   fi
+  if [ "$tool" = "codeception" ]; then
+    sudo ln -s "$composer_bin"/codecept "$composer_bin"/codeception
+  fi
 }
 
 # Function to configure PECL
 configure_pecl() {
   for tool in pear pecl; do
     sudo "$tool" config-set php_ini "$ini_file" >/dev/null 2>&1
-    sudo "$tool" config-set auto_discover 1 >/dev/null 2>&1
     sudo "$tool" channel-update "$tool".php.net >/dev/null 2>&1
   done
 }
@@ -201,26 +230,49 @@ add_pecl() {
   add_log "$tick" "PECL" "Added"
 }
 
+# Function to backup 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 ln -sf "$brew_prefix/lib/old_$lib_name" "$brew_prefix/lib/$lib_name"
+  done
+}
+
 # Function to update dependencies
 update_dependencies() {
-  if [ "$version" = '8.0' ]; then
+  if [ "${ImageOS:-}" != "" ] && [ "${ImageVersion:-}" != "" ]; then
     while read -r formula; do
-      curl -o "$(brew --prefix)/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/$formula.rb" "${curl_opts[@]}" "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/$formula.rb" &
+      (
+        curl -o "$tap_dir/homebrew/homebrew-core/Formula/$formula.rb" "${curl_opts[@]}" "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/$formula.rb"
+        link_libraries "$formula"
+      ) &
       to_wait+=( $! )
-    done < "$(brew --prefix)/Homebrew/Library/Taps/shivammathur/homebrew-php/.github/deps/${ImageOS:?}_${ImageVersion:?}"
+    done < "$tap_dir/shivammathur/homebrew-php/.github/deps/${ImageOS:?}_${ImageVersion:?}"
     wait "${to_wait[@]}"
   fi
 }
 
 # Function to setup PHP and composer
 setup_php() {
+  add_brew_tap shivammathur/homebrew-php
   update_dependencies
-  export HOMEBREW_NO_INSTALL_CLEANUP=TRUE
-  brew tap --shallow shivammathur/homebrew-php
   brew upgrade shivammathur/php/php@"$version" 2>/dev/null || brew install shivammathur/php/php@"$version"
   brew link --force --overwrite php@"$version"
 }
 
+# Function to configure PHP
+configure_php() {
+  (
+    echo -e "date.timezone=UTC\nmemory_limit=-1"
+    [[ "$version" =~ 8.0 ]] && echo -e "opcache.enable=1\nopcache.jit_buffer_size=256M\nopcache.jit=1235"
+    [[ "$version" =~ 7.[2-4]|8.0 ]] && echo -e "xdebug.mode=coverage"
+  ) | sudo tee -a "$ini_file" >/dev/null
+}
+
 # Variables
 tick="✓"
 cross="✗"
@@ -229,7 +281,16 @@ dist=$2
 tool_path_dir="/usr/local/bin"
 curl_opts=(-sL)
 composer_bin="$HOME/.composer/vendor/bin"
+composer_json="$HOME/.composer/composer.json"
+composer_lock="$HOME/.composer/composer.lock"
+brew_prefix="$(brew --prefix)"
+brew_repo="$(brew --repository)"
+tap_dir="$brew_repo"/Library/Taps
 existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
+export HOMEBREW_CHANGE_ARCH_TO_ARM=1
+export HOMEBREW_NO_INSTALL_CLEANUP=1
+export HOMEBREW_NO_AUTO_UPDATE=1
+export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
 
 # Setup PHP
 step_log "Setup PHP"
@@ -241,11 +302,15 @@ else
 fi
 ini_file=$(php -d "date.timezone=UTC" --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
 sudo chmod 777 "$ini_file" "$tool_path_dir"
-echo -e "date.timezone=UTC\nmemory_limit=-1" >>"$ini_file"
+configure_php
 ext_dir=$(php -i | grep -Ei "extension_dir => /" | sed -e "s|.*=> s*||")
 scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
 sudo mkdir -m 777 -p "$ext_dir" "$HOME/.composer"
 semver=$(php -v | head -n 1 | cut -f 2 -d ' ')
+if [ "${semver%.*}" != "$version" ]; then
+  add_log "$cross" "PHP" "Could not setup PHP $version"
+  exit 1
+fi
 configure_pecl
 sudo cp "$dist"/../src/configs/*.json "$RUNNER_TOOL_CACHE/"
 add_log "$tick" "PHP" "$status PHP $semver"

src/scripts/linux.sh

@@ -16,33 +16,49 @@ add_log() {
   fi
 }
 
-# Function to backup and cleanup package lists
+# Function to backup and cleanup package lists.
 cleanup_lists() {
   if [ ! -e /etc/apt/sources.list.d.save ]; then
-    sudo mv /etc/apt/sources.list.d /etc/apt/sources.list.d.save || true
+    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/ || true
+    sudo mv /etc/apt/sources.list.d.save/*ondrej*.list /etc/apt/sources.list.d/
+    sudo mv /etc/apt/sources.list.d.save/*dotdeb*.list /etc/apt/sources.list.d/ 2>/dev/null || true
     trap "sudo mv /etc/apt/sources.list.d.save/*.list /etc/apt/sources.list.d/ 2>/dev/null" exit
   fi
 }
 
-# Function to update php ppa
+# Function to add ppa:ondrej/php.
+add_ppa() {
+  if ! apt-cache policy | grep -q ondrej/php; then
+    cleanup_lists
+    LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y
+    if [ "$DISTRIB_RELEASE" = "16.04" ]; then
+      sudo "$debconf_fix" apt-get update
+    fi
+  fi
+}
+
+# Function to update the package lists.
 update_lists() {
-  if [ "$lists_updated" = "false" ]; then
-    cleanup_lists >/dev/null 2>&1
+  if [ ! -e /tmp/setup_php ]; then
+    [ "$DISTRIB_RELEASE" = "20.04" ] && add_ppa >/dev/null 2>&1
+    cleanup_lists
     sudo "$debconf_fix" apt-get update >/dev/null 2>&1
+    echo '' | sudo tee /tmp/setup_php >/dev/null 2>&1
   fi
 }
 
 # Function to configure PECL
 configure_pecl() {
-  if [ "$pecl_config" = "false" ] && [ -e /usr/bin/pecl ]; then
-    for tool in pear pecl; do
-      sudo "$tool" config-set php_ini "$pecl_file" >/dev/null 2>&1
-      sudo "$tool" config-set auto_discover 1 >/dev/null 2>&1
-      sudo "$tool" channel-update "$tool".php.net >/dev/null 2>&1
+  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}" >/dev/null 2>&1
+      sudo "$script" channel-update "$script".php.net >/dev/null 2>&1
     done
-    pecl_config="true"
+    echo '' | sudo tee /tmp/pecl_config >/dev/null 2>&1
   fi
 }
 
@@ -103,12 +119,8 @@ add_extension() {
   elif check_extension "$extension"; then
     add_log "$tick" "$extension" "Enabled"
   elif ! check_extension "$extension"; then
-    if [ "$version" = "8.0" ]; then
-      pecl_install "$extension"
-    else
     eval "$install_command" >/dev/null 2>&1 ||
     (update_lists && eval "$install_command" >/dev/null 2>&1) || pecl_install "$extension"
-    fi
     (check_extension "$extension" && add_log "$tick" "$extension" "Installed and enabled") ||
     add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
   fi
@@ -120,6 +132,7 @@ add_pecl_extension() {
   extension=$1
   pecl_version=$2
   prefix=$3
+  configure_pecl
   if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot|preview).* ]]; then
     pecl_version=$(get_pecl_version "$extension" "$pecl_version")
   fi
@@ -157,10 +170,14 @@ configure_composer() {
     add_log "$cross" "composer" "Could not download composer"
     exit 1;
   fi
-  composer -q global config process-timeout 0
+  if ! [ -e "$composer_json" ]; then
+    echo '{}' | tee "$composer_json" >/dev/null 2>&1
+    sudo chmod 644 "$composer_json"
+  fi
+  composer -q config -g process-timeout 0
   echo "$composer_bin" >> "$GITHUB_PATH"
   if [ -n "$COMPOSER_TOKEN" ]; then
-    composer -q global config github-oauth.github.com "$COMPOSER_TOKEN"
+    composer -q config -g github-oauth.github.com "$COMPOSER_TOKEN"
   fi
 }
 
@@ -207,12 +224,16 @@ add_composertool() {
   release=$2
   prefix=$3
   (
+    sudo rm -f "$composer_lock" >/dev/null 2>&1 || true
     composer global require "$prefix$release" >/dev/null 2>&1 &&
     add_log "$tick" "$tool" "Added"
   ) || add_log "$cross" "$tool" "Could not setup $tool"
   if [ -e "$composer_bin/composer" ]; then
     sudo cp -p "$tool_path_dir/composer" "$composer_bin"
   fi
+  if [ "$tool" = "codeception" ]; then
+    sudo ln -s "$composer_bin"/codecept "$composer_bin"/codeception
+  fi
 }
 
 # Function to setup phpize and php-config
@@ -230,6 +251,16 @@ setup_master() {
   curl "${curl_opts[@]}" https://github.com/shivammathur/php-builder/releases/latest/download/install.sh | bash -s "github"
 }
 
+add_packaged_php() {
+  if [ "${use_package_cache:-true}" = "false" ]; then
+    update_lists
+    IFS=' ' read -r -a packages <<<"$(echo "cli curl mbstring xml intl" | sed "s/[^ ]*/php$version-&/g")"
+    $apt_install "${packages[@]}"
+  else
+    curl "${curl_opts[@]}" https://github.com/shivammathur/php-ubuntu/releases/latest/download/install.sh | bash -s "$version"
+  fi
+}
+
 # Function to setup PECL
 add_pecl() {
   add_devtools
@@ -258,11 +289,18 @@ php_semver() {
   fi
 }
 
+# Function to configure PHP
+configure_php() {
+  (
+    echo -e "date.timezone=UTC\nmemory_limit=-1"
+    [[ "$version" =~ 8.0 ]] && echo -e "opcache.enable=1\nopcache.jit_buffer_size=256M\nopcache.jit=1235"
+    [[ "$version" =~ 7.[2-4]|8.0 ]] && echo -e "xdebug.mode=coverage"
+  ) | sudo tee -a "$pecl_file" >/dev/null
+}
+
 # Variables
 tick="✓"
 cross="✗"
-lists_updated="false"
-pecl_config="false"
 version=$1
 dist=$2
 debconf_fix="DEBIAN_FRONTEND=noninteractive"
@@ -270,27 +308,21 @@ apt_install="sudo $debconf_fix apt-fast install -y"
 tool_path_dir="/usr/local/bin"
 curl_opts=(-sL)
 composer_bin="$HOME/.composer/vendor/bin"
+composer_json="$HOME/.composer/composer.json"
+composer_lock="$HOME/.composer/composer.lock"
 existing_version=$(php-config --version 2>/dev/null | cut -c 1-3)
 
 # Setup PHP
 step_log "Setup PHP"
 sudo mkdir -m 777 -p "$HOME/.composer" /var/run /run/php
 . /etc/lsb-release
-if [ "$DISTRIB_RELEASE" = "20.04" ]; then
-  if ! apt-cache policy | grep -q ondrej/php; then
-    cleanup_lists >/dev/null 2>&1
-    LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y >/dev/null 2>&1
-  fi
-fi
 
 if [ "$existing_version" != "$version" ]; then
   if [ ! -e "/usr/bin/php$version" ]; then
     if [ "$version" = "8.0" ]; then
       setup_master >/dev/null 2>&1
     else
-      update_lists
-      IFS=' ' read -r -a packages <<< "$(echo "cli curl mbstring xml intl" | sed "s/[^ ]*/php$version-&/g")"
-      $apt_install "${packages[@]}" >/dev/null 2>&1
+      add_packaged_php >/dev/null 2>&1
     fi
     status="Installed"
   else
@@ -302,12 +334,17 @@ else
   status="Found"
 fi
 
+if ! command -v php"$version" >/dev/null; then
+  add_log "$cross" "PHP" "Could not setup PHP $version"
+  exit 1
+fi
 semver=$(php_semver)
 scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
 ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
 ext_dir=$(php -i | grep "extension_dir => /" | sed -e "s|.*=> s*||")
 pecl_file="$scan_dir"/99-pecl.ini
 echo '' | sudo tee "$pecl_file" >/dev/null 2>&1
+configure_php
 sudo rm -rf /usr/local/bin/phpunit >/dev/null 2>&1
 sudo chmod 777 "$ini_file" "$pecl_file" "$tool_path_dir"
 sudo cp "$dist"/../src/configs/*.json "$RUNNER_TOOL_CACHE/"

src/scripts/win32.ps1

@@ -155,10 +155,13 @@ Function Edit-ComposerConfig() {
     Add-Log "$cross" "composer" "Could not download composer"
     exit 1;
   }
-  composer -q global config process-timeout 0
+  if (-not(Test-Path $composer_json)) {
+    Set-Content -Path $composer_json -Value "{}"
+  }
+  composer -q config -g process-timeout 0
   Write-Output $composer_bin | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
   if (Test-Path env:COMPOSER_TOKEN) {
-    composer -q global config github-oauth.github.com $env:COMPOSER_TOKEN
+    composer -q config -g github-oauth.github.com $env:COMPOSER_TOKEN
   }
 }
 
@@ -200,15 +203,15 @@ Function Add-Tool() {
     $bat_content += "php %BIN_TARGET% %*"
     Set-Content -Path $php_dir\$tool.bat -Value $bat_content
     Add-ToProfile $current_profile $tool "New-Alias $tool $php_dir\$tool.bat" >$null 2>&1
-    if($tool -eq "phan") {
+    if($tool -eq "composer") {
+      Edit-ComposerConfig $php_dir\$tool
+    } elseif($tool -eq "cs2pr") {
+      (Get-Content $php_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $php_dir/cs2pr
+    } elseif($tool -eq "phan") {
       Add-Extension fileinfo >$null 2>&1
       Add-Extension ast >$null 2>&1
     } elseif($tool -eq "phive") {
       Add-Extension xml >$null 2>&1
-    } elseif($tool -eq "cs2pr") {
-      (Get-Content $php_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $php_dir/cs2pr
-    } elseif($tool -eq "composer") {
-      Edit-ComposerConfig $php_dir\$tool
     } elseif($tool -eq "wp-cli") {
       Copy-Item $php_dir\wp-cli.bat -Destination $php_dir\wp.bat
     }
@@ -236,7 +239,13 @@ Function Add-Composertool() {
     [string]
     $prefix
   )
+  if(Test-Path $composer_lock) {
+    Remove-Item -Path $composer_lock -Force
+  }
   composer -q global require $prefix$release 2>&1 | out-null
+  if($tool -eq "codeception") {
+    Copy-Item $composer_bin\codecept.bat -Destination $composer_bin\codeception.bat
+  }
   if($?) {
     Add-Log $tick $tool "Added"
   } else {
@@ -260,6 +269,8 @@ $current_profile = "$PSHOME\Profile.ps1"
 $ProgressPreference = 'SilentlyContinue'
 $github = 'https://github.com'
 $composer_bin = "$env:APPDATA\Composer\vendor\bin"
+$composer_json = "$env:APPDATA\Composer\composer.json"
+$composer_lock = "$env:APPDATA\Composer\composer.lock"
 $master_version = '8.0'
 $arch = 'x64'
 $ts = $env:PHPTS -eq 'ts'
@@ -288,20 +299,29 @@ if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version
     Install-PSPackage VcRedist VcRedist-main\VcRedist\VcRedist "$github/aaronparker/VcRedist/archive/main.zip" >$null 2>&1
     $arch='x86'
   }
+  try {
     if ($version -eq $master_version) {
       $version = 'master'
-    Invoke-WebRequest -UseBasicParsing -Uri https://dl.bintray.com/shivammathur/php/Install-PhpMaster.ps1 -OutFile $php_dir\Install-PhpMaster.ps1 > $null 2>&1
-    & $php_dir\Install-PhpMaster.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir
+      Invoke-WebRequest -UseBasicParsing -Uri https://github.com/shivammathur/php-builder-windows/releases/latest/download/Get-Php.ps1 -OutFile $php_dir\Get-Php.ps1 > $null 2>&1
+      & $php_dir\Get-Php.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir
     } else {
       Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force > $null 2>&1
     }
+  } catch { }
 } else {
   $status = "Found"
 }
 
 $installed = Get-Php -Path $php_dir
-Set-PhpIniKey -Key 'date.timezone' -Value 'UTC' -Path $php_dir
-Set-PhpIniKey -Key 'memory_limit' -Value '-1' -Path $php_dir
+if($installed.MajorMinorVersion -ne $version) {
+  Add-Log $cross "PHP" "Could not setup PHP $version"
+  exit 1
+}
+('date.timezone=UTC', 'memory_limit=-1', 'xdebug.mode=coverage') | ForEach-Object { $p=$_.split('='); Set-PhpIniKey -Key $p[0] -Value $p[1] -Path $php_dir }
+# 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 openssl, curl, opcache, mbstring -Path $php_dir
 Update-PhpCAInfo -Path $php_dir -Source CurrentUser
 Copy-Item -Path $dist\..\src\configs\*.json -Destination $env:RUNNER_TOOL_CACHE

src/tools.ts

@@ -99,93 +99,26 @@ export async function getUri(
   }
 }
 
-/**
- * Helper function to get the codeception url
- *
- * @param version
- * @param suffix
- */
-export async function getCodeceptionUriBuilder(
-  version: string,
-  suffix: string
-): Promise<string> {
-  return ['releases', version, suffix, 'codecept.phar']
-    .filter(Boolean)
-    .join('/');
-}
-
-/**
- * Function to get the codeception url
- *
- * @param version
- * @param php_version
- */
-export async function getCodeceptionUri(
-  version: string,
-  php_version: string
-): Promise<string> {
-  const codecept: string = await getCodeceptionUriBuilder(version, '');
-  const codecept54: string = await getCodeceptionUriBuilder(version, 'php54');
-  const codecept56: string = await getCodeceptionUriBuilder(version, 'php56');
-  // Refer to https://codeception.com/builds
-  switch (true) {
-    case /latest/.test(version):
-      switch (true) {
-        case /5\.6|7\.[0|1]/.test(php_version):
-          return 'php56/codecept.phar';
-        case /7\.[2-4]/.test(php_version):
-        default:
-          return 'codecept.phar';
-      }
-    case /(^[4-9]|\d{2,})\..*/.test(version):
-      switch (true) {
-        case /5\.6|7\.[0|1]/.test(php_version):
-          return codecept56;
-        case /7\.[2-4]/.test(php_version):
-        default:
-          return codecept;
-      }
-    case /(^2\.[4-5]\.\d+|^3\.[0-1]\.\d+).*/.test(version):
-      switch (true) {
-        case /5\.6/.test(php_version):
-          return codecept54;
-        case /7\.[0-4]/.test(php_version):
-        default:
-          return codecept;
-      }
-    case /^2\.3\.\d+.*/.test(version):
-      switch (true) {
-        case /5\.[4-6]/.test(php_version):
-          return codecept54;
-        case /^7\.[0-4]$/.test(php_version):
-        default:
-          return codecept;
-      }
-    case /(^2\.(1\.([6-9]|\d{2,}))|^2\.2\.\d+).*/.test(version):
-      switch (true) {
-        case /5\.[4-5]/.test(php_version):
-          return codecept54;
-        case /5.6|7\.[0-4]/.test(php_version):
-        default:
-          return codecept;
-      }
-    case /(^2\.(1\.[0-5]|0\.\d+)|^1\.[6-8]\.\d+).*/.test(version):
-      return codecept;
-    default:
-      return codecept;
-  }
-}
-
 /**
  * Helper function to get script to setup phive
  *
  * @param version
+ * @param php_version
  * @param os_version
  */
 export async function addPhive(
   version: string,
+  php_version: string,
   os_version: string
 ): Promise<string> {
+  switch (true) {
+    case /5\.6|7\.0/.test(php_version):
+      version = version.replace('latest', '0.12.1');
+      break;
+    case /7\.1/.test(php_version):
+      version = version.replace('latest', '0.13.5');
+      break;
+  }
   switch (version) {
     case 'latest':
       return (
@@ -338,7 +271,10 @@ export async function getCleanedToolsList(
     .map(function (extension: string) {
       return extension
         .trim()
-        .replace(/robmorgan\/|hirak\/|narrowspark\/automatic-/, '');
+        .replace(
+          /codeception\/|hirak\/|robmorgan\/|narrowspark\/automatic-/,
+          ''
+        );
     })
     .filter(Boolean);
   return [...new Set(tools_list)];
@@ -458,7 +394,7 @@ export async function addTools(
         script += await addArchive(tool, url, os_version);
         break;
       case 'phive':
-        script += await addPhive(version, os_version);
+        script += await addPhive(version, php_version, os_version);
         break;
       case 'phpstan':
         url = github + 'phpstan/phpstan/' + uri;
@@ -477,10 +413,7 @@ export async function addTools(
         script += await addArchive('composer', url, os_version);
         break;
       case 'codeception':
-        url =
-          'https://codeception.com/' +
-          (await getCodeceptionUri(version, php_version));
-        script += await addArchive(tool, url, os_version);
+        script += await addPackage(tool, release, 'codeception/', os_version);
         break;
       case 'phpcpd':
       case 'phpunit':

src/utils.ts

@@ -1,4 +1,6 @@
+import {IncomingMessage} from 'http';
 import * as fs from 'fs';
+import * as https from 'https';
 import * as path from 'path';
 import * as core from '@actions/core';
 
@@ -41,6 +43,45 @@ export async function getInput(
   }
 }
 
+/**
+ * Function to fetch an URL
+ *
+ * @param url
+ */
+export async function fetch(url: string): Promise<string> {
+  const fetch_promise: Promise<string> = new Promise(resolve => {
+    const req = https.get(url, (res: IncomingMessage) => {
+      res.setEncoding('utf8');
+      let body = '';
+      res.on('data', chunk => (body += chunk));
+      res.on('end', () => resolve(body));
+    });
+    req.end();
+  });
+  return await fetch_promise;
+}
+
+/**
+ * Function to parse PHP version.
+ *
+ * @param version
+ */
+export async function parseVersion(version: string): Promise<string> {
+  const manifest =
+    'https://raw.githubusercontent.com/shivammathur/setup-php/develop/src/configs/php-versions.json';
+  switch (true) {
+    case /^(latest|\d+\.x)$/.test(version):
+      return JSON.parse(await fetch(manifest))[version];
+    default:
+      switch (true) {
+        case version.length > 1:
+          return version.slice(0, 3);
+        default:
+          return version + '.0';
+      }
+  }
+}
+
 /**
  * Async foreach loop
  *
@@ -209,8 +250,7 @@ export async function extensionArray(
           return extension
             .trim()
             .toLowerCase()
-            .replace('php-', '')
-            .replace('php_', '');
+            .replace(/^php[-_]/, '');
         })
         .filter(Boolean);
   }
@@ -229,9 +269,12 @@ export async function CSVArray(values_csv: string): Promise<Array<string>> {
       return [];
     default:
       return values_csv
-        .split(',')
-        .map(function (value: string) {
-          return value.trim();
+        .split(/,(?=(?:(?:[^"']*["']){2})*[^"']*$)/)
+        .map(function (value) {
+          return value
+            .trim()
+            .replace(/^["']|["']$|(?<==)["']/g, '')
+            .replace(/=(((?!E_).)*[?{}|&~![()^]+((?!E_).)+)/, "='$1'");
         })
         .filter(Boolean);
   }
@@ -243,14 +286,11 @@ 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'];
-  switch (zend.indexOf(extension)) {
-    case 0:
-    case 1:
-      return 'zend_extension';
-    case -1:
+  switch (true) {
     default:
       return 'extension';
+    case /xdebug([2-3])?$|opcache|ioncube|eaccelerator/.test(extension):
+      return 'zend_extension';
   }
 }