Update all lists

.eslintrc.json

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

.github/workflows/experimental-workflow.yml

@@ -2,19 +2,13 @@ name: Experimental workflow
 on:
   pull_request:
     branches:
-      - nightly
+      - releases/v1
-      - master
-      - develop
-      - verbose
     paths-ignore:
       - '**.md'
       - 'examples/**'
   push:
     branches:
-      - nightly
+      - releases/v1
-      - master
-      - develop
-      - verbose
     paths-ignore:
       - '**.md'
       - 'examples/**'

.github/workflows/workflow.yml

@@ -2,17 +2,13 @@ name: Main workflow
 on:
   pull_request:
     branches:
-      - master
+      - releases/v1
-      - develop
-      - verbose
     paths-ignore:
       - '**.md'
       - 'examples/**'
   push:
     branches:
-      - master
+      - releases/v1
-      - develop
-      - verbose
     paths-ignore:
       - '**.md'
       - 'examples/**'

README.md

@@ -60,7 +60,7 @@ Setup PHP with required extensions, php.ini configuration, code-coverage support
 |Windows Server 2019|`windows-latest` or `windows-2019`|
 |Ubuntu 18.04|`ubuntu-latest` or `ubuntu-18.04`|
 |Ubuntu 16.04|`ubuntu-16.04`|
-|macOS X Catalina 10.15|`macos-latest` or `macOS-10.15`|
+|macOS X Catalina 10.15|`macos-latest` or `macos-10.15`|
 
 ## :heavy_plus_sign: PHP Extension Support
 - On `ubuntu` by default extensions which are available as a package can be installed. If the extension is not available as a package but it is on `PECL`, it can be installed by specifying `pecl` in the tools input.

__tests__/extensions.test.ts

@@ -3,15 +3,29 @@ import * as extensions from '../src/extensions';
 describe('Extension tests', () => {
   it('checking addExtensionOnWindows', async () => {
     let win32: string = await extensions.addExtension(
-      'xdebug, pcov, phalcon4, ast-beta',
+      'Xdebug, pcov, sqlite, phalcon4, ast-beta',
       '7.4',
       'win32'
     );
     expect(win32).toContain('Add-Extension xdebug');
     expect(win32).toContain('Add-Extension pcov');
+    expect(win32).toContain('Add-Extension sqlite3');
     expect(win32).toContain('phalcon.ps1 phalcon4');
     expect(win32).toContain('Add-Extension ast beta');
 
+    win32 = await extensions.addExtension('mysql', '7.4', 'win32');
+    expect(win32).toContain('Add-Extension mysqli');
+    expect(win32).toContain('Add-Extension mysqlnd');
+
+    win32 = await extensions.addExtension('mysql', '8.0', 'win32');
+    expect(win32).toContain('Add-Extension mysqli');
+    expect(win32).toContain('Add-Extension mysqlnd');
+
+    win32 = await extensions.addExtension('mysql', '5.6', 'win32');
+    expect(win32).toContain('Add-Extension mysql');
+    expect(win32).toContain('Add-Extension mysqli');
+    expect(win32).toContain('Add-Extension mysqlnd');
+
     win32 = await extensions.addExtension(
       'phalcon3, does_not_exist',
       '7.2',
@@ -27,13 +41,14 @@ describe('Extension tests', () => {
 
   it('checking addExtensionOnLinux', async () => {
     let linux: string = await extensions.addExtension(
-      'xdebug, pcov, ast-beta, xdebug-alpha',
+      'Xdebug, pcov, sqlite, ast-beta, xdebug-alpha',
       '7.4',
       'linux'
     );
-    expect(linux).toContain('update_extension xdebug 2.9.0');
+    expect(linux).toContain('update_extension xdebug 2.9.2');
+    expect(linux).toContain('sudo $debconf_fix apt-get install -y php7.4-pcov');
     expect(linux).toContain(
-      'sudo DEBIAN_FRONTEND=noninteractive apt-get install -y php7.4-pcov'
+      'sudo $debconf_fix apt-get install -y php7.4-sqlite3'
     );
     expect(linux).toContain('add_unstable_extension ast beta extension');
     expect(linux).toContain(
@@ -64,12 +79,13 @@ describe('Extension tests', () => {
 
   it('checking addExtensionOnDarwin', async () => {
     let darwin: string = await extensions.addExtension(
-      'xdebug, pcov, ast-beta',
+      'Xdebug, pcov, sqlite, ast-beta',
       '7.2',
       'darwin'
     );
     expect(darwin).toContain('sudo pecl install -f xdebug');
     expect(darwin).toContain('sudo pecl install -f pcov');
+    expect(darwin).toContain('sudo pecl install -f sqlite3');
     expect(darwin).toContain('add_unstable_extension ast beta extension');
 
     darwin = await extensions.addExtension('phalcon3', '7.0', 'darwin');

__tests__/install.test.ts

@@ -69,6 +69,8 @@ jest.mock('../src/install', () => ({
  * @param extension_csv
  * @param ini_values_csv
  * @param coverage_driver
+ * @param tools
+ * @param pecl
  */
 function setEnv(
   version: string | number,

__tests__/matchers.test.ts

@@ -1,16 +1,6 @@
 import * as io from '@actions/io';
-import * as path from 'path';
-import * as fs from 'fs';
 import * as matchers from '../src/matchers';
 
-async function cleanup(path: string): Promise<void> {
-  fs.unlink(path, error => {
-    if (error) {
-      console.log(error);
-    }
-  });
-}
-
 jest.mock('@actions/io');
 
 describe('Matchers', () => {

__tests__/tools.test.ts

@@ -2,28 +2,34 @@ import * as tools from '../src/tools';
 
 describe('Tools tests', () => {
   it('checking getCommand', async () => {
-    expect(await tools.getArchiveCommand('linux')).toBe('add_tool ');
+    expect(await tools.getCommand('linux', 'tool')).toBe('add_tool ');
-    expect(await tools.getArchiveCommand('darwin')).toBe('add_tool ');
+    expect(await tools.getCommand('darwin', 'tool')).toBe('add_tool ');
-    expect(await tools.getArchiveCommand('win32')).toBe('Add-Tool ');
+    expect(await tools.getCommand('win32', 'tool')).toBe('Add-Tool ');
-    expect(await tools.getArchiveCommand('fedora')).toContain(
+    expect(await tools.getCommand('fedora', 'tool')).toContain(
       'Platform fedora is not supported'
     );
   });
 
   it('checking getCommand', async () => {
-    expect(await tools.getPackageCommand('linux')).toBe('add_composer_tool ');
+    expect(await tools.getCommand('linux', 'composertool')).toBe(
-    expect(await tools.getPackageCommand('darwin')).toBe('add_composer_tool ');
+      'add_composertool '
-    expect(await tools.getPackageCommand('win32')).toBe('Add-Composer-Tool ');
+    );
-    expect(await tools.getPackageCommand('fedora')).toContain(
+    expect(await tools.getCommand('darwin', 'composertool')).toBe(
+      'add_composertool '
+    );
+    expect(await tools.getCommand('win32', 'composertool')).toBe(
+      'Add-Composertool '
+    );
+    expect(await tools.getCommand('fedora', 'composertool')).toContain(
       'Platform fedora is not supported'
     );
   });
 
-  it('checking getPECLCommand', async () => {
+  it('checking getCommand', async () => {
-    expect(await tools.getPECLCommand('linux')).toBe('add_pecl ');
+    expect(await tools.getCommand('linux', 'pecl')).toBe('add_pecl ');
-    expect(await tools.getPECLCommand('darwin')).toBe('add_pecl ');
+    expect(await tools.getCommand('darwin', 'pecl')).toBe('add_pecl ');
-    expect(await tools.getPECLCommand('win32')).toBe('Add-PECL ');
+    expect(await tools.getCommand('win32', 'pecl')).toBe('Add-Pecl ');
-    expect(await tools.getPECLCommand('fedora')).toContain(
+    expect(await tools.getCommand('fedora', 'pecl')).toContain(
       'Platform fedora is not supported'
     );
   });
@@ -107,22 +113,13 @@ describe('Tools tests', () => {
   });
 
   it('checking getCodeceptionUriBuilder', async () => {
-    expect(await tools.getCodeceptionUriBuilder('3.2.1', '5.6', 'php56')).toBe(
+    expect(await tools.getCodeceptionUriBuilder('3.2.1', 'php56')).toBe(
       'releases/3.2.1/php56/codecept.phar'
     );
-    expect(await tools.getCodeceptionUriBuilder('3.2.1', '7.0', 'php54')).toBe(
+    expect(await tools.getCodeceptionUriBuilder('3.2.1', 'php54')).toBe(
       'releases/3.2.1/php54/codecept.phar'
     );
-    expect(await tools.getCodeceptionUriBuilder('3.2.1', '7.1', 'php56')).toBe(
+    expect(await tools.getCodeceptionUriBuilder('3.2.1', '')).toBe(
-      'releases/3.2.1/php56/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUriBuilder('3.2.1', '7.2', 'php56')).toBe(
-      'releases/3.2.1/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUriBuilder('3.2.1', '7.3', 'php56')).toBe(
-      'releases/3.2.1/codecept.phar'
-    );
-    expect(await tools.getCodeceptionUriBuilder('3.2.1', '7.4', 'php56')).toBe(
       'releases/3.2.1/codecept.phar'
     );
   });
@@ -146,17 +143,59 @@ describe('Tools tests', () => {
     expect(await tools.getCodeceptionUri('latest', '7.4')).toBe(
       'codecept.phar'
     );
-    expect(await tools.getCodeceptionUri('3.2.1', '5.6')).toBe(
+    expect(await tools.getCodeceptionUri('4.0.0', '7.4')).toBe(
-      'releases/3.2.1/php54/codecept.phar'
+      'releases/4.0.0/codecept.phar'
     );
-    expect(await tools.getCodeceptionUri('4.3.2', '5.6')).toBe(
+    expect(await tools.getCodeceptionUri('4.0.0', '5.6')).toBe(
-      'releases/4.3.2/php56/codecept.phar'
+      'releases/4.0.0/php56/codecept.phar'
     );
-    expect(await tools.getCodeceptionUri('3.2.1', '7.4')).toBe(
+    expect(await tools.getCodeceptionUri('4.0.0', '7.1')).toBe(
-      'releases/3.2.1/codecept.phar'
+      'releases/4.0.0/php56/codecept.phar'
     );
-    expect(await tools.getCodeceptionUri('4.3.2', '7.4')).toBe(
+    expect(await tools.getCodeceptionUri('3.1.0', '7.4')).toBe(
-      'releases/4.3.2/codecept.phar'
+      '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'
     );
   });
 
@@ -173,11 +212,11 @@ describe('Tools tests', () => {
   });
 
   it('checking getPhpunitUri', async () => {
-    expect(await tools.getPhpunitUrl('tool', 'latest')).toBe(
+    expect(await tools.getPharUrl('domain', 'tool', '', 'latest')).toBe(
-      'https://phar.phpunit.de/tool.phar'
+      'domain/tool.phar'
     );
-    expect(await tools.getPhpunitUrl('tool', '1.2.3')).toBe(
+    expect(await tools.getPharUrl('domain', 'tool', 'v', '1.2.3')).toBe(
-      'https://phar.phpunit.de/tool-1.2.3.phar'
+      'domain/tool-v1.2.3.phar'
     );
   });
 
@@ -190,7 +229,7 @@ describe('Tools tests', () => {
     );
   });
 
-  it('checking getDeployerUri', async () => {
+  it('checking addComposer', async () => {
     expect(await tools.addComposer(['a', 'b'])).toStrictEqual([
       'composer',
       'a',
@@ -311,13 +350,13 @@ describe('Tools tests', () => {
       'user/',
       'linux'
     );
-    expect(script).toContain('add_composer_tool tool tool:1.2.3 user/');
+    expect(script).toContain('add_composertool tool tool:1.2.3 user/');
 
     script = await tools.addPackage('tool', 'tool:1.2.3', 'user/', 'darwin');
-    expect(script).toContain('add_composer_tool tool tool:1.2.3 user/');
+    expect(script).toContain('add_composertool tool tool:1.2.3 user/');
 
     script = await tools.addPackage('tool', 'tool:1.2.3', 'user/', 'win32');
-    expect(script).toContain('Add-Composer-Tool tool tool:1.2.3 user/');
+    expect(script).toContain('Add-Composertool tool tool:1.2.3 user/');
 
     script = await tools.addPackage('tool', 'tool:1.2.3', 'user/', 'fedora');
     expect(script).toContain('Platform fedora is not supported');
@@ -330,7 +369,7 @@ describe('Tools tests', () => {
       'linux'
     );
     expect(script).toContain(
-      'add_tool https://github.com/composer/composer/releases/latest/download/composer.phar composer'
+      'add_tool https://getcomposer.org/composer-stable.phar composer'
     );
     expect(script).toContain(
       'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr'
@@ -351,8 +390,8 @@ describe('Tools tests', () => {
       'add_tool https://github.com/symfony/cli/releases/latest/download/symfony_linux_amd64 symfony'
     );
     expect(script).toContain('add_pecl');
-    expect(script).toContain('add_composer_tool phinx phinx robmorgan/');
+    expect(script).toContain('add_composertool phinx phinx robmorgan/');
-    expect(script).toContain('add_composer_tool phinx phinx:1.2.3 robmorgan/');
+    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"');
     expect(script).toContain('add_log "$tick" "phpize" "Added"');
@@ -364,7 +403,7 @@ describe('Tools tests', () => {
       'darwin'
     );
     expect(script).toContain(
-      'add_tool https://github.com/composer/composer/releases/latest/download/composer.phar composer'
+      'add_tool https://getcomposer.org/composer-stable.phar composer'
     );
     expect(script).toContain(
       'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/download/1.2.3/cs2pr cs2pr'
@@ -384,12 +423,12 @@ describe('Tools tests', () => {
     expect(script).toContain(
       'https://github.com/vimeo/psalm/releases/latest/download/psalm.phar psalm'
     );
-    expect(script).toContain('add_composer_tool phinx phinx robmorgan/');
+    expect(script).toContain('add_composertool phinx phinx robmorgan/');
     expect(script).toContain(
       'add_tool https://github.com/phar-io/phive/releases/download/1.2.3/phive-1.2.3.phar phive'
     );
     expect(script).toContain(
-      'add_composer_tool composer-prefetcher composer-prefetcher:1.2.3 narrowspark/automatic-'
+      'add_composertool composer-prefetcher composer-prefetcher:1.2.3 narrowspark/automatic-'
     );
     expect(script).toContain(
       'add_tool https://github.com/symfony/cli/releases/latest/download/symfony_darwin_amd64 symfony'
@@ -407,7 +446,7 @@ describe('Tools tests', () => {
       'win32'
     );
     expect(script).toContain(
-      'Add-Tool https://github.com/composer/composer/releases/latest/download/composer.phar composer'
+      'Add-Tool https://getcomposer.org/composer-stable.phar composer'
     );
     expect(script).toContain(
       'Add-Tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr'
@@ -415,13 +454,11 @@ describe('Tools tests', () => {
     expect(script).toContain(
       'Add-Tool https://deployer.org/deployer.phar deployer'
     );
-    expect(script).toContain(
+    expect(script).toContain('Add-Composertool prestissimo prestissimo hirak/');
-      'Add-Composer-Tool prestissimo prestissimo hirak/'
-    );
     expect(script).toContain(
       'Add-Tool https://github.com/phpmd/phpmd/releases/latest/download/phpmd.phar phpmd'
     );
-    expect(script).toContain('Add-Composer-Tool phinx phinx robmorgan/');
+    expect(script).toContain('Add-Composertool phinx phinx robmorgan/');
     expect(script).toContain(
       'Add-Tool https://github.com/phar-io/phive/releases/download/0.13.2/phive-0.13.2.phar phive'
     );
@@ -440,14 +477,12 @@ describe('Tools tests', () => {
       'win32'
     );
     expect(script).toContain(
-      'Add-Tool https://github.com/composer/composer/releases/latest/download/composer.phar composer'
+      'Add-Tool https://getcomposer.org/composer-stable.phar composer'
     );
+    expect(script).toContain('Add-Composertool prestissimo prestissimo hirak/');
+    expect(script).toContain('Add-Composertool phinx phinx robmorgan/');
     expect(script).toContain(
-      'Add-Composer-Tool prestissimo prestissimo hirak/'
+      'Add-Composertool composer-prefetcher composer-prefetcher narrowspark/automatic-'
-    );
-    expect(script).toContain('Add-Composer-Tool phinx phinx robmorgan/');
-    expect(script).toContain(
-      'Add-Composer-Tool composer-prefetcher composer-prefetcher narrowspark/automatic-'
     );
   });
 });

__tests__/utils.test.ts

@@ -55,12 +55,12 @@ describe('Utils tests', () => {
       path.join(__dirname, '../src/scripts/win32.ps1'),
       'utf8'
     );
-    expect(await utils.readScript('darwin.sh', '7.4', 'darwin')).toBe(darwin);
+    expect(await utils.readScript('darwin.sh')).toBe(darwin);
-    expect(await utils.readScript('darwin.sh', '7.3', 'darwin')).toBe(darwin);
+    expect(await utils.readScript('darwin.sh')).toBe(darwin);
-    expect(await utils.readScript('linux.sh', '7.4', 'linux')).toBe(linux);
+    expect(await utils.readScript('linux.sh')).toBe(linux);
-    expect(await utils.readScript('linux.sh', '7.3', 'linux')).toBe(linux);
+    expect(await utils.readScript('linux.sh')).toBe(linux);
-    expect(await utils.readScript('win32.ps1', '7.4', 'win32')).toBe(win32);
+    expect(await utils.readScript('win32.ps1')).toBe(win32);
-    expect(await utils.readScript('win32.ps1', '7.3', 'win32')).toBe(win32);
+    expect(await utils.readScript('win32.ps1')).toBe(win32);
   });
 
   it('checking writeScripts', async () => {

action.yml

@@ -3,6 +3,7 @@ author: shivammathur
 description: 'Setup PHP with required extensions, php.ini configuration, code-coverage support and various tools like composer'
 branding:
   color: 'purple'
+  icon: 'play-circle'
 inputs:
   php-version:
     description: 'Setup PHP version.'
@@ -20,18 +21,17 @@ inputs:
   tools:
     description: 'Setup popular tools globally.'
     required: false
-  # Deprecated options, do not use. Will not be supported in v2 which will be released around February 1, 2020.
   extension-csv:
     description: 'Deprecated! Use extensions instead.'
-    deprecationMessage: 'The extension-csv property will not be supported in v2. Use extensions instead.'
+    deprecationMessage: 'The extension-csv property is deprecated. Use extensions instead.'
     required: false
   ini-values-csv:
     description: 'Deprecated! Use ini-values instead.'
-    deprecationMessage: 'The ini-values-csv property will not be supported in v2. Use ini-values instead.'
+    deprecationMessage: 'The ini-values-csv property is deprecated. Use ini-values instead.'
     required: false
   pecl:
     description: 'Deprecated! Use tools instead to setup PECL.'
-    deprecationMessage: 'The pecl property will not be supported in v2. Specify pecl in tools instead.'
+    deprecationMessage: 'The pecl property is deprecated. Specify pecl in tools instead.'
     required: false
 runs:
   using: 'node12'

examples/cakephp-mysql.yml

@@ -34,6 +34,8 @@ jobs:
           # Install memcached if using ext-memcached
           extensions: mbstring, intl, redis, pdo_mysql
           coverage: pcov
+      - name: Start mysql service
+        run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"

examples/laravel-mysql.yml

@@ -41,6 +41,8 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, dom, fileinfo, mysql
           coverage: xdebug #optional
+      - name: Start mysql service
+        run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"

examples/lumen-mysql.yml

@@ -41,6 +41,8 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, dom, fileinfo, mysql
           coverage: xdebug #optional
+      - name: Start mysql service
+        run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"

examples/phalcon-mysql.yml

@@ -41,6 +41,8 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, dom, zip, phalcon4, mysql #use phalcon3 for the phalcon 3.x.
           coverage: xdebug #optional
+      - name: Start mysql service
+        run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"

examples/symfony-mysql.yml

@@ -28,6 +28,8 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite, mysql
           coverage: xdebug #optional
+      - name: Start mysql service
+        run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"

examples/yii2-mysql.yml

@@ -38,6 +38,8 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, intl, gd, imagick, zip, dom, mysql
           coverage: xdebug #optional
+      - name: Start mysql service
+        run: sudo /etc/init.d/mysql start
       - name: Get composer cache directory
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "1.8.2",
+  "version": "1.8.6",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "dist/index.js",
@@ -24,28 +24,28 @@
   "author": "shivammathur",
   "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.2.2",
+    "@actions/core": "^1.2.3",
     "@actions/exec": "^1.0.3",
     "@actions/io": "^1.0.2",
     "fs": "0.0.1-security"
   },
   "devDependencies": {
-    "@types/jest": "^25.1.1",
+    "@types/jest": "^25.1.4",
-    "@types/node": "^13.7.0",
+    "@types/node": "^13.9.1",
-    "@typescript-eslint/eslint-plugin": "^2.18.0",
+    "@typescript-eslint/eslint-plugin": "^2.24.0",
-    "@typescript-eslint/parser": "^2.18.0",
+    "@typescript-eslint/parser": "^2.24.0",
-    "@zeit/ncc": "^0.21.0",
+    "@zeit/ncc": "^0.21.1",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.10.0",
     "eslint-plugin-import": "^2.20.1",
-    "eslint-plugin-jest": "^23.6.0",
+    "eslint-plugin-jest": "^23.8.2",
     "eslint-plugin-prettier": "^3.1.2",
-    "husky": "^4.2.1",
+    "husky": "^4.2.3",
     "jest": "^25.1.0",
     "jest-circus": "^25.1.0",
     "prettier": "^1.19.1",
-    "ts-jest": "^25.1.0",
+    "ts-jest": "^25.2.1",
-    "typescript": "^3.7.5"
+    "typescript": "^3.8.3"
   },
   "husky": {
     "skipCI": true,

src/config.ts

@@ -44,6 +44,7 @@ export async function addINIValuesWindows(
  *
  * @param ini_values_csv
  * @param os_version
+ * @param no_step
  */
 export async function addINIValues(
   ini_values_csv: string,

src/extensions.ts

@@ -16,11 +16,11 @@ export async function addExtensionDarwin(
   const extensions: Array<string> = await utils.extensionArray(extension_csv);
   let script = '\n';
   await utils.asyncForEach(extensions, async function(extension: string) {
-    extension = extension.toLowerCase();
     const version_extension: string = version + extension;
     const [extension_name, stability]: string[] = extension.split('-');
-    const prefix = await utils.getExtensionPrefix(extension_name);
+    const ext_prefix = await utils.getExtensionPrefix(extension_name);
-    let install_command = '';
+    const command_prefix = 'sudo pecl install -f ';
+    let command = '';
     switch (true) {
       // match pre-release versions
       case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
@@ -30,43 +30,54 @@ export async function addExtensionDarwin(
           ' ' +
           stability +
           ' ' +
-          prefix;
+          ext_prefix;
         return;
+      // match 5.6xdebug
       case /5\.6xdebug/.test(version_extension):
-        install_command = 'sudo pecl install -f xdebug-2.5.5' + pipe;
+        command = command_prefix + 'xdebug-2.5.5' + pipe;
         break;
+      // match 7.0xdebug
       case /7\.0xdebug/.test(version_extension):
-        install_command = 'sudo pecl install -f xdebug-2.9.0' + pipe;
+        command = command_prefix + 'xdebug-2.9.0' + pipe;
         break;
+      // match 5.6redis
       case /5\.6redis/.test(version_extension):
-        install_command = 'sudo pecl install -f redis-2.2.8' + pipe;
+        command = command_prefix + 'redis-2.2.8' + pipe;
         break;
-      case /[5-9]\.\dimagick/.test(version_extension):
+      // match imagick
-        install_command =
+      case /^imagick$/.test(extension):
+        command =
           'brew install pkg-config imagemagick' +
           pipe +
-          ' && sudo pecl install -f imagick' +
+          ' && ' +
+          command_prefix +
+          'imagick' +
           pipe;
         break;
+      // match sqlite
+      case /^sqlite$/.test(extension):
+        extension = 'sqlite3';
+        command = command_prefix + extension + pipe;
+        break;
+      // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
       case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
-        install_command =
+        script +=
           'sh ' +
           path.join(__dirname, '../src/scripts/ext/phalcon_darwin.sh') +
           ' ' +
           extension +
           ' ' +
-          version +
+          version;
-          pipe;
+        return;
-        break;
       default:
-        install_command = 'sudo pecl install -f ' + extension + pipe;
+        command = command_prefix + extension + pipe;
         break;
     }
     script +=
       '\nadd_extension ' +
       extension +
       ' "' +
-      install_command +
+      command +
       '" ' +
       (await utils.getExtensionPrefix(extension));
   });
@@ -78,17 +89,14 @@ export async function addExtensionDarwin(
  *
  * @param extension_csv
  * @param version
- * @param pipe
  */
 export async function addExtensionWindows(
   extension_csv: string,
-  version: string,
+  version: string
-  pipe: string
 ): Promise<string> {
   const extensions: Array<string> = await utils.extensionArray(extension_csv);
   let script = '\n';
   await utils.asyncForEach(extensions, async function(extension: string) {
-    extension = extension.toLowerCase();
     const [extension_name, stability]: string[] = extension.split('-');
     const version_extension: string = version + extension;
     switch (true) {
@@ -96,6 +104,22 @@ export async function addExtensionWindows(
       case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
         script += '\nAdd-Extension ' + extension_name + ' ' + stability;
         break;
+      // match 5.6mysql, 5.6mysqli, 5.6mysqlnd
+      case /^5\.6(mysql|mysqli|mysqlnd)$/.test(version_extension):
+        script +=
+          '\nAdd-Extension mysql\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
+        break;
+      // match 7.0mysql..8.0mysql
+      // match 7.0mysqli..8.0mysqli
+      // match 7.0mysqlnd..8.0mysqlnd
+      case /[7-8]\.\d(mysql|mysqli|mysqlnd)$/.test(version_extension):
+        script += '\nAdd-Extension mysqli\nAdd-Extension mysqlnd';
+        break;
+      // match sqlite
+      case /^sqlite$/.test(extension):
+        extension = 'sqlite3';
+        script += '\nAdd-Extension ' + extension;
+        break;
       // match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
       case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
         script +=
@@ -130,11 +154,11 @@ export async function addExtensionLinux(
   const extensions: Array<string> = await utils.extensionArray(extension_csv);
   let script = '\n';
   await utils.asyncForEach(extensions, async function(extension: string) {
-    extension = extension.toLowerCase();
     const version_extension: string = version + extension;
     const [extension_name, stability]: string[] = extension.split('-');
-    const prefix = await utils.getExtensionPrefix(extension_name);
+    const ext_prefix = await utils.getExtensionPrefix(extension_name);
-    let install_command = '';
+    const command_prefix = 'sudo $debconf_fix apt-get install -y php';
+    let command = '';
     switch (true) {
       // match pre-release versions
       case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
@@ -144,11 +168,11 @@ export async function addExtensionLinux(
           ' ' +
           stability +
           ' ' +
-          prefix;
+          ext_prefix;
         return;
       // match 5.6gearman..7.4gearman
       case /^((5\.6)|(7\.[0-4]))gearman$/.test(version_extension):
-        install_command =
+        command =
           'sh ' +
           path.join(__dirname, '../src/scripts/ext/gearman.sh') +
           ' ' +
@@ -168,14 +192,19 @@ export async function addExtensionLinux(
       // match 7.0xdebug..7.4xdebug
       case /^7\.[0-4]xdebug$/.test(version_extension):
         script +=
-          '\nupdate_extension xdebug 2.9.0' +
+          '\nupdate_extension xdebug 2.9.2' +
           pipe +
           '\n' +
           (await utils.addLog('$tick', 'xdebug', 'Enabled', 'linux'));
         return;
+      // match sqlite
+      case /^sqlite$/.test(extension):
+        extension = 'sqlite3';
+        command = command_prefix + version + '-' + extension + pipe;
+        break;
       default:
-        install_command =
+        command =
-          'sudo DEBIAN_FRONTEND=noninteractive apt-get install -y php' +
+          command_prefix +
           version +
           '-' +
           extension.replace('pdo_', '').replace('pdo-', '') +
@@ -183,7 +212,7 @@ export async function addExtensionLinux(
         break;
     }
     script +=
-      '\nadd_extension ' + extension + ' "' + install_command + '" ' + prefix;
+      '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
   });
   return script;
 }
@@ -194,7 +223,7 @@ export async function addExtensionLinux(
  * @param extension_csv
  * @param version
  * @param os_version
- * @param log_prefix
+ * @param no_step
  */
 export async function addExtension(
   extension_csv: string,
@@ -216,7 +245,7 @@ export async function addExtension(
 
   switch (os_version) {
     case 'win32':
-      return script + (await addExtensionWindows(extension_csv, version, pipe));
+      return script + (await addExtensionWindows(extension_csv, version));
     case 'darwin':
       return script + (await addExtensionDarwin(extension_csv, version, pipe));
     case 'linux':

src/install.ts

@@ -37,7 +37,7 @@ export async function build(
     tools_csv = 'pecl, ' + tools_csv;
   }
 
-  let script: string = await utils.readScript(filename, version, os_version);
+  let script: string = await utils.readScript(filename);
   script += await tools.addTools(tools_csv, version, os_version);
 
   if (extension_csv) {