Fix db extensions

Bump version to 1.8.5
Bump ECMAScript version
2025-08-01 19:27:57 +07:00 · 2020-03-16 08:04:49 +05:30 · 2020-03-14 09:12:58 +05:30 · 2020-03-14 07:56:11 +05:30 · 2020-03-14 07:54:36 +05:30 · 2020-03-14 07:53:43 +05:30
18 changed files with 989 additions and 1058 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -17,7 +17,6 @@
    "camelcase": "off",
    "require-atomic-updates": "off",
    "@typescript-eslint/ban-ts-ignore": "off",
-    "@typescript-eslint/camelcase": "off",
-    "@typescript-eslint/no-unused-vars": "off"
+    "@typescript-eslint/camelcase": "off"
  }
 }
--- a/README.md
+++ b/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.
--- a/tests/extensions.test.ts
+++ b/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');
--- a/tests/install.test.ts
+++ b/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,
--- a/tests/matchers.test.ts
+++ b/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', () => {
--- a/tests/utils.test.ts
+++ b/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', '7.3', 'darwin')).toBe(darwin);
-    expect(await utils.readScript('linux.sh', '7.4', 'linux')).toBe(linux);
-    expect(await utils.readScript('linux.sh', '7.3', 'linux')).toBe(linux);
-    expect(await utils.readScript('win32.ps1', '7.4', 'win32')).toBe(win32);
-    expect(await utils.readScript('win32.ps1', '7.3', 'win32')).toBe(win32);
+    expect(await utils.readScript('darwin.sh')).toBe(darwin);
+    expect(await utils.readScript('darwin.sh')).toBe(darwin);
+    expect(await utils.readScript('linux.sh')).toBe(linux);
+    expect(await utils.readScript('linux.sh')).toBe(linux);
+    expect(await utils.readScript('win32.ps1')).toBe(win32);
+    expect(await utils.readScript('win32.ps1')).toBe(win32);
  });

  it('checking writeScripts', async () => {
--- a/dist/index.js
+++ b/dist/index.js
--- a/jest.config.js
+++ b/jest.config.js
@ -9,4 +9,4 @@ module.exports = {
  },
  verbose: true,
  collectCoverage: true
-};
+};
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "setup-php",
-  "version": "1.8.4",
+  "version": "1.8.5",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@ -32,18 +32,18 @@
      }
    },
    "@babel/core": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.6.tgz",
-      "integrity": "sha512-Sheg7yEJD51YHAvLEV/7Uvw95AeWqYPL3Vk3zGujJKIhJ+8oLw2ALaf3hbucILhKsgSoADOvtKRJuNVdcJkOrg==",
+      "version": "7.8.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz",
+      "integrity": "sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==",
      "dev": true,
      "requires": {
        "@babel/code-frame": "^7.8.3",
-        "@babel/generator": "^7.8.6",
+        "@babel/generator": "^7.8.7",
        "@babel/helpers": "^7.8.4",
-        "@babel/parser": "^7.8.6",
+        "@babel/parser": "^7.8.7",
        "@babel/template": "^7.8.6",
        "@babel/traverse": "^7.8.6",
-        "@babel/types": "^7.8.6",
+        "@babel/types": "^7.8.7",
        "convert-source-map": "^1.7.0",
        "debug": "^4.1.0",
        "gensync": "^1.0.0-beta.1",
@ -69,12 +69,12 @@
      }
    },
    "@babel/generator": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.6.tgz",
-      "integrity": "sha512-4bpOR5ZBz+wWcMeVtcf7FbjcFzCp+817z2/gHNncIRcM9MmKzUhtWCYAq27RAfUrAFwb+OCG1s9WEaVxfi6cjg==",
+      "version": "7.8.8",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.8.tgz",
+      "integrity": "sha512-HKyUVu69cZoclptr8t8U5b6sx6zoWjh8jiUhnuj3MpZuKT2dJ8zPTuiy31luq32swhI0SpwItCIlU8XW7BZeJg==",
      "dev": true,
      "requires": {
-        "@babel/types": "^7.8.6",
+        "@babel/types": "^7.8.7",
        "jsesc": "^2.5.1",
        "lodash": "^4.17.13",
        "source-map": "^0.5.0"
@ -198,9 +198,9 @@
      }
    },
    "@babel/parser": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.6.tgz",
-      "integrity": "sha512-trGNYSfwq5s0SgM1BMEB8hX3NDmO7EP2wsDGDexiaKMB92BaRpS+qZfpkMqUBhcsOTBwNy9B/jieo4ad/t/z2g==",
+      "version": "7.8.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.8.tgz",
+      "integrity": "sha512-mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA==",
      "dev": true
    },
    "@babel/plugin-syntax-bigint": {
@ -222,12 +222,12 @@
      }
    },
    "@babel/runtime": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz",
-      "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==",
+      "version": "7.8.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz",
+      "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==",
      "dev": true,
      "requires": {
-        "regenerator-runtime": "^0.13.2"
+        "regenerator-runtime": "^0.13.4"
      }
    },
    "@babel/template": {
@ -267,9 +267,9 @@
      }
    },
    "@babel/types": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz",
-      "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==",
+      "version": "7.8.7",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz",
+      "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==",
      "dev": true,
      "requires": {
        "esutils": "^2.0.2",
@ -294,9 +294,9 @@
      },
      "dependencies": {
        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
          "dev": true
        }
      }
@ -662,9 +662,9 @@
      }
    },
    "@types/jest": {
-      "version": "25.1.3",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.1.3.tgz",
-      "integrity": "sha512-jqargqzyJWgWAJCXX96LBGR/Ei7wQcZBvRv0PLEu9ZByMfcs23keUJrKv9FMR6YZf9YCbfqDqgmY+JUBsnqhrg==",
+      "version": "25.1.4",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.1.4.tgz",
+      "integrity": "sha512-QDDY2uNAhCV7TMCITrxz+MRk1EizcsevzfeS6LykIlq2V1E5oO4wXG8V2ZEd9w7Snxeeagk46YbMgZ8ESHx3sw==",
      "dev": true,
      "requires": {
        "jest-diff": "^25.1.0",
@ -678,9 +678,9 @@
      "dev": true
    },
    "@types/node": {
-      "version": "13.7.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.7.tgz",
-      "integrity": "sha512-Uo4chgKbnPNlxQwoFmYIwctkQVkMMmsAoGGU4JKwLuvBefF0pCq4FybNSnfkfRCpC7ZW7kttcC/TrRtAJsvGtg==",
+      "version": "13.9.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.1.tgz",
+      "integrity": "sha512-E6M6N0blf/jiZx8Q3nb0vNaswQeEyn0XlupO+xN6DtJ6r6IT4nXrTry7zhIfYvFCl3/8Cu6WIysmUBKiqV0bqQ==",
      "dev": true
    },
    "@types/parse-json": {
@ -711,12 +711,12 @@
      "dev": true
    },
    "@typescript-eslint/eslint-plugin": {
-      "version": "2.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.21.0.tgz",
-      "integrity": "sha512-b5jjjDMxzcjh/Sbjuo7WyhrQmVJg0WipTHQgXh5Xwx10uYm6nPWqN1WGOsaNq4HR3Zh4wUx4IRQdDkCHwyewyw==",
+      "version": "2.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.23.0.tgz",
+      "integrity": "sha512-8iA4FvRsz8qTjR0L/nK9RcRUN3QtIHQiOm69FzV7WS3SE+7P7DyGGwh3k4UNR2JBbk+Ej2Io+jLAaqKibNhmtw==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/experimental-utils": "2.21.0",
+        "@typescript-eslint/experimental-utils": "2.23.0",
        "eslint-utils": "^1.4.3",
        "functional-red-black-tree": "^1.0.1",
        "regexpp": "^3.0.0",
@ -724,32 +724,32 @@
      }
    },
    "@typescript-eslint/experimental-utils": {
-      "version": "2.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.21.0.tgz",
-      "integrity": "sha512-olKw9JP/XUkav4lq0I7S1mhGgONJF9rHNhKFn9wJlpfRVjNo3PPjSvybxEldvCXnvD+WAshSzqH5cEjPp9CsBA==",
+      "version": "2.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.23.0.tgz",
+      "integrity": "sha512-OswxY59RcXH3NNPmq+4Kis2CYZPurRU6mG5xPcn24CjFyfdVli5mySwZz/g/xDbJXgDsYqNGq7enV0IziWGXVQ==",
      "dev": true,
      "requires": {
        "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/typescript-estree": "2.21.0",
+        "@typescript-eslint/typescript-estree": "2.23.0",
        "eslint-scope": "^5.0.0"
      }
    },
    "@typescript-eslint/parser": {
-      "version": "2.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.21.0.tgz",
-      "integrity": "sha512-VrmbdrrrvvI6cPPOG7uOgGUFXNYTiSbnRq8ZMyuGa4+qmXJXVLEEz78hKuqupvkpwJQNk1Ucz1TenrRP90gmBg==",
+      "version": "2.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.23.0.tgz",
+      "integrity": "sha512-k61pn/Nepk43qa1oLMiyqApC6x5eP5ddPz6VUYXCAuXxbmRLqkPYzkFRKl42ltxzB2luvejlVncrEpflgQoSUg==",
      "dev": true,
      "requires": {
        "@types/eslint-visitor-keys": "^1.0.0",
-        "@typescript-eslint/experimental-utils": "2.21.0",
-        "@typescript-eslint/typescript-estree": "2.21.0",
+        "@typescript-eslint/experimental-utils": "2.23.0",
+        "@typescript-eslint/typescript-estree": "2.23.0",
        "eslint-visitor-keys": "^1.1.0"
      }
    },
    "@typescript-eslint/typescript-estree": {
-      "version": "2.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.21.0.tgz",
-      "integrity": "sha512-NC/nogZNb9IK2MEFQqyDBAciOT8Lp8O3KgAfvHx2Skx6WBo+KmDqlU3R9KxHONaijfTIKtojRe3SZQyMjr3wBw==",
+      "version": "2.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.23.0.tgz",
+      "integrity": "sha512-pmf7IlmvXdlEXvE/JWNNJpEvwBV59wtJqA8MLAxMKLXNKVRC3HZBXR/SlZLPWTCcwOSg9IM7GeRSV3SIerGVqw==",
      "dev": true,
      "requires": {
        "debug": "^4.1.1",
@ -790,9 +790,9 @@
      },
      "dependencies": {
        "acorn": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz",
-          "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
          "dev": true
        }
      }
@ -1113,9 +1113,9 @@
      }
    },
    "browser-process-hrtime": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz",
-      "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
      "dev": true
    },
    "browser-resolve": {
@ -1883,9 +1883,9 @@
      }
    },
    "eslint-plugin-jest": {
-      "version": "23.8.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.8.1.tgz",
-      "integrity": "sha512-OycLNqPo/2EfO6kTqnmsu1khz1gTIOxGl3ThIVwL5/oycDF4pm5uNDyvFelNLdpr4COUuM8PVi3963NEG1Efpw==",
+      "version": "23.8.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.8.2.tgz",
+      "integrity": "sha512-xwbnvOsotSV27MtAe7s8uGWOori0nUsrXh2f1EnpmXua8sDfY6VZhHAhHg2sqK7HBNycRQExF074XSZ7DvfoFg==",
      "dev": true,
      "requires": {
        "@typescript-eslint/experimental-utils": "^2.5.0"
@ -1926,13 +1926,13 @@
      "dev": true
    },
    "espree": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz",
-      "integrity": "sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
+      "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
      "dev": true,
      "requires": {
-        "acorn": "^7.1.0",
-        "acorn-jsx": "^5.1.0",
+        "acorn": "^7.1.1",
+        "acorn-jsx": "^5.2.0",
        "eslint-visitor-keys": "^1.1.0"
      }
    },
@ -2395,9 +2395,9 @@
      }
    },
    "globals": {
-      "version": "12.3.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz",
-      "integrity": "sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==",
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
      "dev": true,
      "requires": {
        "type-fest": "^0.8.1"
@ -2739,9 +2739,9 @@
      "dev": true
    },
    "inquirer": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.5.tgz",
-      "integrity": "sha512-6Z5cP+LAO0rzNE7xWjWtT84jxKa5ScLEGLgegPXeO3dGeU8lNe5Ii7SlXH6KVtLGlDuaEhsvsFjrjWjw8j5lFg==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
+      "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
      "dev": true,
      "requires": {
        "ansi-escapes": "^4.2.1",
@ -3682,9 +3682,9 @@
      },
      "dependencies": {
        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
          "dev": true
        }
      }
@ -4430,9 +4430,9 @@
      }
    },
    "regenerator-runtime": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
-      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==",
+      "version": "0.13.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
      "dev": true
    },
    "regex-not": {
@ -4782,9 +4782,9 @@
          }
        },
        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
          "dev": true
        },
        "normalize-path": {
@ -5506,6 +5506,16 @@
          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
          "dev": true
+        },
+        "yargs-parser": {
+          "version": "16.1.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz",
+          "integrity": "sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
        }
      }
    },
@ -5713,12 +5723,12 @@
      }
    },
    "w3c-hr-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz",
-      "integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
      "dev": true,
      "requires": {
-        "browser-process-hrtime": "^0.1.2"
+        "browser-process-hrtime": "^1.0.0"
      }
    },
    "w3c-xmlserializer": {
@ -5850,9 +5860,9 @@
      }
    },
    "ws": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.1.tgz",
-      "integrity": "sha512-sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz",
+      "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==",
      "dev": true
    },
    "xml-name-validator": {
@ -5874,18 +5884,18 @@
      "dev": true
    },
    "yaml": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.7.2.tgz",
-      "integrity": "sha512-qXROVp90sb83XtAoqE8bP9RwAkTTZbugRUTm5YeFCBfNRPEp2YzTeqWiz7m5OORHzEvrA/qcGS8hp/E+MMROYw==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.8.2.tgz",
+      "integrity": "sha512-omakb0d7FjMo3R1D2EbTKVIk6dAVLRxFXdLZMEUToeAvuqgG/YuHMuQOZ5fgk+vQ8cx+cnGKwyg+8g8PNT0xQg==",
      "dev": true,
      "requires": {
-        "@babel/runtime": "^7.6.3"
+        "@babel/runtime": "^7.8.7"
      }
    },
    "yargs": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz",
-      "integrity": "sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==",
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.0.tgz",
+      "integrity": "sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==",
      "dev": true,
      "requires": {
        "cliui": "^6.0.0",
@ -5898,7 +5908,7 @@
        "string-width": "^4.2.0",
        "which-module": "^2.0.0",
        "y18n": "^4.0.0",
-        "yargs-parser": "^16.1.0"
+        "yargs-parser": "^18.1.0"
      },
      "dependencies": {
        "find-up": {
@ -5953,9 +5963,9 @@
      }
    },
    "yargs-parser": {
-      "version": "16.1.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz",
-      "integrity": "sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==",
+      "version": "18.1.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.0.tgz",
+      "integrity": "sha512-o/Jr6JBOv6Yx3pL+5naWSoIA2jJ+ZkMYQG/ie9qFbukBe4uzmBatlXFOiu/tNKRWEtyf+n5w7jc/O16ufqOTdQ==",
      "dev": true,
      "requires": {
        "camelcase": "^5.0.0",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "setup-php",
-  "version": "1.8.4",
+  "version": "1.8.5",
  "private": false,
  "description": "Setup PHP for use with GitHub Actions",
  "main": "dist/index.js",
@ -30,15 +30,15 @@
    "fs": "0.0.1-security"
  },
  "devDependencies": {
-    "@types/jest": "^25.1.3",
-    "@types/node": "^13.7.7",
-    "@typescript-eslint/eslint-plugin": "^2.21.0",
-    "@typescript-eslint/parser": "^2.21.0",
+    "@types/jest": "^25.1.4",
+    "@types/node": "^13.9.1",
+    "@typescript-eslint/eslint-plugin": "^2.23.0",
+    "@typescript-eslint/parser": "^2.23.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.8.1",
+    "eslint-plugin-jest": "^23.8.2",
    "eslint-plugin-prettier": "^3.1.2",
    "husky": "^4.2.3",
    "jest": "^25.1.0",
--- a/src/config.ts
+++ b/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,
--- a/src/extensions.ts
+++ b/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);
-    let install_command = '';
+    const ext_prefix = await utils.getExtensionPrefix(extension_name);
+    const command_prefix = 'sudo pecl install -f ';
+    let command = '';
    switch (true) {
      // match pre-release versions
      case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
@ -30,24 +30,36 @@ 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):
-        install_command =
+      // match imagick
+      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):
        script +=
          'sh ' +
@ -58,14 +70,14 @@ export async function addExtensionDarwin(
          version;
        return;
      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));
  });
@ -77,17 +89,14 @@ export async function addExtensionDarwin(
 *
 * @param extension_csv
 * @param version
- * @param pipe
 */
 export async function addExtensionWindows(
  extension_csv: string,
-  version: string,
-  pipe: string
+  version: 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) {
@ -95,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 +=
@ -129,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);
-    let install_command = '';
+    const ext_prefix = await utils.getExtensionPrefix(extension_name);
+    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):
@ -143,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') +
          ' ' +
@ -167,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 =
-          'sudo DEBIAN_FRONTEND=noninteractive apt-get install -y php' +
+        command =
+          command_prefix +
          version +
          '-' +
          extension.replace('pdo_', '').replace('pdo-', '') +
@ -182,7 +212,7 @@ export async function addExtensionLinux(
        break;
    }
    script +=
-      '\nadd_extension ' + extension + ' "' + install_command + '" ' + prefix;
+      '\nadd_extension ' + extension + ' "' + command + '" ' + ext_prefix;
  });
  return script;
 }
@ -193,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,
@ -215,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':
--- a/src/install.ts
+++ b/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) {
--- a/src/scripts/darwin.sh
+++ b/src/scripts/darwin.sh
@ -27,7 +27,11 @@ remove_extension() {
 # Function to test if extension is loaded
 check_extension() {
  extension=$1
-  php -m | grep -i -q -w "$extension"
+  if [ "$extension" != "mysql" ]; then
+    php -m | grep -i -q -w "$extension"
+  else
+    php -m | grep -i -q "$extension"
+  fi
 }

 # Fuction to get the PECL version
--- a/src/scripts/linux.sh
+++ b/src/scripts/linux.sh
@ -51,7 +51,11 @@ get_pecl_version() {
 # Function to test if extension is loaded
 check_extension() {
  extension=$1
-  php -m | grep -i -q -w "$extension"
+  if [ "$extension" != "mysql" ]; then
+    php -m | grep -i -q -w "$extension"
+  else
+    php -m | grep -i -q "$extension"
+  fi
 }

 # Function to delete extensions
--- a/src/tools.ts
+++ b/src/tools.ts
@ -4,6 +4,7 @@ import * as utils from './utils';
 * Function to get command to setup tools
 *
 * @param os_version
+ * @param suffix
 */
 export async function getCommand(
  os_version: string,
@ -69,6 +70,8 @@ export async function parseTool(
 /**
 * Function to get the url of tool with the given version
 *
+ * @param tool
+ * @param extension
 * @param version
 * @param prefix
 * @param version_prefix
@ -167,16 +170,14 @@ export async function getCodeceptionUri(
    case /(^2\.(1\.[0-5]|0\.\d+)|^1\.[6-8]\.\d+).*/.test(version):
      return codecept;
    default:
-      return await codecept;
+      return codecept;
  }
 }

 /**
 * Helper function to get script to setup phive
 *
- * @param tool
 * @param version
- * @param url
 * @param os_version
 */
 export async function addPhive(
@ -204,6 +205,9 @@ export async function addPhive(
 /**
 * Function to get the phar url in domain/tool-version.phar format
 *
+ * @param domain
+ * @param tool
+ * @param prefix
 * @param version
 */
 export async function getPharUrl(
@ -272,7 +276,7 @@ export async function getSymfonyUri(
 /**
 * Function to add/move composer in the tools list
 *
- * @param tools
+ * @param tools_list
 */
 export async function addComposer(tools_list: string[]): Promise<string[]> {
  const regex = /^composer($|:.*)/;
@ -381,7 +385,8 @@ export async function addPackage(
 /**
 * Setup tools
 *
- * @param tool_csv
+ * @param tools_csv
+ * @param php_version
 * @param os_version
 */
 export async function addTools(
@ -439,7 +444,7 @@ export async function addTools(
        break;
      case 'composer':
        // If RC is released as latest release, switch to getcomposer.
-        // Prefered source is GitHub as it is faster.
+        // Preferred source is GitHub as it is faster.
        // url = github + 'composer/composer/releases/latest/download/composer.phar';
        url = 'https://getcomposer.org/composer-stable.phar';
        script += await addArchive(tool, version, url, os_version);
--- a/src/utils.ts
+++ b/src/utils.ts
@ -65,7 +65,6 @@ export async function color(type: string): Promise<string> {
 * @param message
 * @param os_version
 * @param log_type
- * @param prefix
 */
 export async function log(
  message: string,
@ -121,6 +120,7 @@ export async function stepLog(
 * @param mark
 * @param subject
 * @param message
+ * @param os_version
 */
 export async function addLog(
  mark: string,
@ -147,14 +147,8 @@ export async function addLog(
 * Read the scripts
 *
 * @param filename
- * @param version
- * @param os_version
 */
-export async function readScript(
-  filename: string,
-  version: string,
-  os_version: string
-): Promise<string> {
+export async function readScript(filename: string): Promise<string> {
  return fs.readFileSync(
    path.join(__dirname, '../src/scripts/' + filename),
    'utf8'
@ -165,7 +159,6 @@ export async function readScript(
 * Write final script which runs
 *
 * @param filename
- * @param version
 * @param script
 */
 export async function writeScript(
@ -196,6 +189,7 @@ export async function extensionArray(
        .map(function(extension: string) {
          return extension
            .trim()
+            .toLowerCase()
            .replace('php-', '')
            .replace('php_', '');
        })
--- a/tsconfig.json
+++ b/tsconfig.json
@ -2,7 +2,7 @@
  "compilerOptions": {
    /* Basic Options */
    // "incremental": true,                   /* Enable incremental compilation */
-    "target": "es6",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
+    "target": "ES2020",                       /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
    // "allowJs": true,                       /* Allow javascript files to be compiled. */
    // "checkJs": true,                       /* Report errors in .js files. */
Author	SHA1	Message	Date
Shivam Mathur	5ad0888329	Fix db extensions	2020-03-16 08:04:49 +05:30
Shivam Mathur	3cfc409e14	Bump version to 1.8.5	2020-03-14 09:12:58 +05:30
Shivam Mathur	ebc671081f	Bump ECMAScript version	2020-03-14 07:56:11 +05:30
Shivam Mathur	efae663c0f	Change case in README	2020-03-14 07:54:36 +05:30
Shivam Mathur	fa8a671e6f	Improve code quality	2020-03-14 07:53:43 +05:30
Shivam Mathur	6a4159ba98	Improve extension support	2020-03-14 07:42:02 +05:30