setup-php 2.15.0 → 2.17.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "2.15.0",
+  "version": "2.17.1",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "lib/install.js",
@@ -16,9 +16,9 @@
   ],
   "scripts": {
     "build": "tsc",
-    "lint": "eslint **/src/*.ts --cache --fix",
-    "format": "prettier --write **/src/*.ts && git add -f src/",
-    "format-check": "prettier --check **/src/*.ts",
+    "lint": "eslint **/src/*.ts **/__tests__/*.ts --cache --fix",
+    "format": "prettier --write **/src/*.ts **/__tests__/*.ts && git add -f src/",
+    "format-check": "prettier --check **/src/*.ts **/__tests__/*.ts",
     "release": "ncc build -o dist && git add -f dist/",
     "test": "jest"
   },
@@ -34,28 +34,29 @@
   "author": "shivammathur",
   "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.5.0",
+    "@actions/core": "^1.6.0",
     "@actions/exec": "^1.1.0",
     "@actions/io": "^1.1.1",
     "fs": "0.0.1-security"
   },
   "devDependencies": {
-    "@types/jest": "^27.0.2",
-    "@types/node": "^16.10.1",
-    "@typescript-eslint/eslint-plugin": "^4.32.0",
-    "@typescript-eslint/parser": "^4.32.0",
-    "@vercel/ncc": "^0.31.1",
-    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.24.2",
-    "eslint-plugin-jest": "^24.4.2",
+    "@types/jest": "^27.4.1",
+    "@types/node": "^17.0.21",
+    "@typescript-eslint/eslint-plugin": "^5.12.1",
+    "@typescript-eslint/parser": "^5.12.1",
+    "@vercel/ncc": "^0.33.3",
+    "eslint": "^8.10.0",
+    "eslint-config-prettier": "^8.4.0",
+    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-jest": "^26.1.1",
     "eslint-plugin-prettier": "^4.0.0",
-    "jest": "^27.2.2",
-    "jest-circus": "^27.2.2",
-    "prettier": "^2.4.1",
-    "simple-git-hooks": "^2.6.1",
-    "ts-jest": "^27.0.5",
-    "typescript": "^4.4.3"
+    "jest": "^27.5.1",
+    "jest-circus": "^27.5.1",
+    "nock": "^13.2.4",
+    "prettier": "^2.5.1",
+    "simple-git-hooks": "^2.7.0",
+    "ts-jest": "^27.1.3",
+    "typescript": "^4.5.5"
   },
   "bugs": {
     "url": "https://github.com/shivammathur/setup-php/issues"

package/src/config.ts

@@ -45,28 +45,28 @@ export async function addINIValuesWindows(
  * Function to add custom ini values
  *
  * @param ini_values_csv
- * @param os_version
+ * @param os
  * @param no_step
  */
 export async function addINIValues(
   ini_values_csv: string,
-  os_version: string,
+  os: string,
   no_step = false
 ): Promise<string> {
   let script = '\n';
   switch (no_step) {
     case true:
       script +=
-        (await utils.stepLog('Add php.ini values', os_version)) +
-        (await utils.suppressOutput(os_version)) +
+        (await utils.stepLog('Add php.ini values', os)) +
+        (await utils.suppressOutput(os)) +
         '\n';
       break;
     case false:
     default:
-      script += (await utils.stepLog('Add php.ini values', os_version)) + '\n';
+      script += (await utils.stepLog('Add php.ini values', os)) + '\n';
       break;
   }
-  switch (os_version) {
+  switch (os) {
     case 'win32':
       return script + (await addINIValuesWindows(ini_values_csv));
     case 'darwin':
@@ -74,8 +74,8 @@ export async function addINIValues(
       return script + (await addINIValuesUnix(ini_values_csv));
     default:
       return await utils.log(
-        'Platform ' + os_version + ' is not supported',
-        os_version,
+        'Platform ' + os + ' is not supported',
+        os,
         'error'
       );
   }

package/src/configs/brew_extensions

@@ -1,10 +1,12 @@
 amqp=amqp
 apcu=apcu
 expect=expect
+gnupg=gnupg
 grpc=grpc
 igbinary=igbinary
 imagick=imagick
 imap=imap
+mailparse=mailparse
 memcache=memcache
 memcached=memcached
 mongodb=mongodb

package/src/configs/composer.env

@@ -0,0 +1,2 @@
+COMPOSER_PROCESS_TIMEOUT=0
+COMPOSER_NO_INTERACTION=1

package/src/configs/ini/jit.ini

@@ -0,0 +1,3 @@
+opcache.enable=1
+opcache.jit_buffer_size=256M
+opcache.jit=1235

package/src/configs/ini/php.ini

@@ -0,0 +1,2 @@
+date.timezone=UTC
+memory_limit=-1

package/src/configs/ini/xdebug.ini

@@ -0,0 +1 @@
+xdebug.mode=coverage

package/src/configs/os_releases.csv

@@ -3,6 +3,7 @@
 10,buster
 11,bullseye
 12,bookworm
+13,trixie
 16.04 LTS,xenial
 16.10,yakkety
 17.04,zesty
@@ -15,3 +16,4 @@
 20.10,groovy
 21.04,hirsute
 21.10,impish
+22.04,jammy

package/src/configs/php-versions.json

@@ -1,7 +1,7 @@
 {
-  "latest": "8.0",
+  "latest": "8.1",
   "nightly": "8.2",
   "5.x": "5.6",
   "7.x": "7.4",
-  "8.x": "8.0"
+  "8.x": "8.1"
 }

package/src/configs/php_packages

@@ -0,0 +1,12 @@
+cgi
+cli
+curl
+dev
+fpm
+intl
+mbstring
+mysql
+opcache
+pgsql
+xml
+zip

package/src/configs/{phpunit.json → pm/phpunit.json}

@@ -1,24 +1,24 @@
-{
-  "problemMatcher": [
-    {
-      "owner": "phpunit",
-      "pattern": [
-        {
-          "regexp": "^\\d+\\)\\s.*$"
-        },
-        {
-          "regexp": "^(.*Failed\\sasserting\\sthat.*)$",
-          "message": 1
-        },
-        {
-          "regexp": "^\\s*$"
-        },
-        {
-          "regexp": "^(.*):(\\d+)$",
-          "file": 1,
-          "line": 2
-        }
-      ]
-    }
-  ]
-}
+{
+  "problemMatcher": [
+    {
+      "owner": "phpunit",
+      "pattern": [
+        {
+          "regexp": "^\\d+\\)\\s.*$"
+        },
+        {
+          "regexp": "^(.*Failed\\sasserting\\sthat.*)$",
+          "message": 1
+        },
+        {
+          "regexp": "^\\s*$"
+        },
+        {
+          "regexp": "^(.*):(\\d+)$",
+          "file": 1,
+          "line": 2
+        }
+      ]
+    }
+  ]
+}

package/src/configs/tools.json

@@ -1,4 +1,12 @@
 {
+  "churn": {
+    "type": "phar",
+    "repository": "bmitch/churn-php",
+    "extension": ".phar",
+    "domain": "https://github.com",
+    "version_prefix": "",
+    "version_parameter": "-V"
+  },
   "composer-normalize": {
     "type": "phar",
     "repository": "ergebnis/composer-normalize",
@@ -81,6 +89,14 @@
     "version_prefix": "",
     "version_parameter": "--version"
   },
+  "phpspec": {
+    "type": "phar",
+    "repository": "phpspec/phpspec",
+    "extension": ".phar",
+    "domain": "https://github.com",
+    "version_prefix": "",
+    "version_parameter": "-V"
+  },
   "phpstan": {
     "type": "phar",
     "repository": "phpstan/phpstan",
@@ -99,58 +115,66 @@
   },
   "behat": {
     "type": "composer",
-    "repository": "behat/behat"
+    "repository": "behat/behat",
+    "scope": "scoped"
   },
   "codeception": {
     "type": "composer",
-    "repository": "codeception/codeception"
+    "repository": "codeception/codeception",
+    "scope": "scoped"
   },
   "automatic-composer-prefetcher": {
     "type": "composer",
     "alias": "composer-prefetcher",
-    "repository": "narrowspark/automatic-composer-prefetcher"
+    "repository": "narrowspark/automatic-composer-prefetcher",
+    "scope": "global"
   },
   "composer-require-checker": {
     "type": "composer",
-    "repository": "maglnet/composer-require-checker"
+    "repository": "maglnet/composer-require-checker",
+    "scope": "scoped"
   },
   "composer-unused": {
     "type": "composer",
-    "repository": "icanhazstring/composer-unused"
+    "repository": "icanhazstring/composer-unused",
+    "scope": "scoped"
   },
   "flex": {
     "type": "composer",
-    "repository": "symfony/flex"
+    "repository": "symfony/flex",
+    "scope": "global"
   },
   "phinx": {
     "type": "composer",
-    "repository": "robmorgan/phinx"
+    "repository": "robmorgan/phinx",
+    "scope": "scoped"
   },
   "phplint": {
     "type": "composer",
-    "repository": "overtrue/phplint"
-  },
-  "phpspec": {
-    "type": "composer",
-    "repository": "phpspec/phpspec"
+    "repository": "overtrue/phplint",
+    "scope": "scoped"
   },
   "phpunit-bridge": {
     "alias": "simple-phpunit",
     "type": "composer",
-    "repository": "symfony/phpunit-bridge"
+    "repository": "symfony/phpunit-bridge",
+    "scope": "global"
   },
   "phpunit-polyfills": {
     "type": "composer",
-    "repository": "yoast/phpunit-polyfills"
+    "repository": "yoast/phpunit-polyfills",
+    "scope": "global"
   },
   "prestissimo": {
     "type": "composer",
-    "repository": "hirak/prestissimo"
+    "repository": "hirak/prestissimo",
+    "scope": "global"
   },
   "vapor-cli": {
     "type": "composer",
     "alias": "vapor",
-    "repository": "laravel/vapor-cli"
+    "repository": "laravel/vapor-cli",
+    "scope": "scoped"
   },
   "blackfire": {
     "type": "custom-package",
@@ -168,6 +192,13 @@
     "domain": "https://github.com",
     "version_prefix": "v"
   },
+  "symfony-cli": {
+    "alias": "symfony",
+    "type": "custom-package",
+    "repository": "symfony-cli/symfony-cli",
+    "domain": "https://github.com",
+    "version_prefix": "-V"
+  },
   "blackfire-player": {
     "type": "custom-function",
     "domain": "https://get.blackfire.io",
@@ -205,7 +236,7 @@
   "phive": {
     "type": "custom-function",
     "repository": "phar-io/phive",
-    "domain": "https://phar.io",
+    "domain": "https://github.com",
     "function": "phive",
     "version_prefix": "",
     "version_parameter": "status"
@@ -235,15 +266,6 @@
     "type": "custom-function",
     "function": "dev_tools"
   },
-  "symfony-cli": {
-    "type": "custom-function",
-    "function": "symfony",
-    "alias": "symfony",
-    "domain": "https://github.com",
-    "repository": "symfony/cli",
-    "version_prefix": "v",
-    "version_parameter": "version"
-  },
   "wp-cli": {
     "type": "custom-function",
     "function": "wp_cli",

package/src/configs/tools_schema.json

@@ -13,6 +13,7 @@
         "fetch_latest": "true",
         "function": "function_name",
         "repository": "user/tool",
+        "scope": "global, scoped",
         "type": "phar, composer, custom-package or custom-function",
         "version_parameter": "--version",
         "version_prefix": "v"
@@ -76,6 +77,16 @@
           "user/tool"
         ]
       },
+      "scope": {
+        "$id": "#/items/properties/scope",
+        "type": "string",
+        "title": "The scope schema",
+        "description": "Scope of tool installation: global or scoped",
+        "enum": [
+          "global",
+          "scoped"
+        ]
+      },
       "type": {
         "$id": "#/items/properties/type",
         "type": "string",

package/src/coverage.ts

@@ -2,33 +2,46 @@ import * as utils from './utils';
 import * as extensions from './extensions';
 import * as config from './config';
 
+export async function checkXdebugError(
+  extension: string,
+  version: string
+): Promise<string> {
+  if (
+    (/^5\.[3-6]$|^7\.[0-1]$/.test(version) && extension == 'xdebug3') ||
+    (/^8\.[0-9]$/.test(version) && extension == 'xdebug2')
+  ) {
+    return extension + ' is not supported on PHP ' + version;
+  }
+  return '';
+}
+
 /**
  * Function to setup Xdebug
  *
  * @param extension
  * @param version
- * @param os_version
+ * @param os
  * @param pipe
  */
 export async function addCoverageXdebug(
   extension: string,
   version: string,
-  os_version: string,
+  os: string,
   pipe: string
 ): Promise<string> {
   let script = '\n';
-  script +=
-    (await extensions.addExtension(':pcov:false', version, os_version, true)) +
-    pipe;
-  script +=
-    (await extensions.addExtension(extension, version, os_version, true)) +
-    pipe;
-  script += await utils.addLog(
-    '$tick',
-    extension,
-    'Xdebug enabled as coverage driver',
-    os_version
-  );
+  let message: string = await checkXdebugError(extension, version);
+  let status = '$cross';
+  if (!message) {
+    script +=
+      (await extensions.addExtension(':pcov:false', version, os, true)) + pipe;
+    extension = extension == 'xdebug3' ? 'xdebug' : extension;
+    script +=
+      (await extensions.addExtension(extension, version, os, true)) + pipe;
+    message = 'Xdebug enabled as coverage driver';
+    status = '$tick';
+  }
+  script += await utils.addLog(status, extension, message, os);
   return script;
 }
 
@@ -36,36 +49,30 @@ export async function addCoverageXdebug(
  * Function to setup PCOV
  *
  * @param version
- * @param os_version
+ * @param os
  * @param pipe
  */
 export async function addCoveragePCOV(
   version: string,
-  os_version: string,
+  os: string,
   pipe: string
 ): Promise<string> {
   let script = '\n';
   switch (true) {
     default:
       script +=
-        (await extensions.addExtension(
-          ':xdebug:false',
-          version,
-          os_version,
-          true
-        )) + pipe;
-      script +=
-        (await extensions.addExtension('pcov', version, os_version, true)) +
+        (await extensions.addExtension(':xdebug:false', version, os, true)) +
         pipe;
       script +=
-        (await config.addINIValues('pcov.enabled=1', os_version, true)) + '\n';
+        (await extensions.addExtension('pcov', version, os, true)) + pipe;
+      script += (await config.addINIValues('pcov.enabled=1', os, true)) + '\n';
 
       // success
       script += await utils.addLog(
         '$tick',
         'coverage: pcov',
         'PCOV enabled as coverage driver',
-        os_version
+        os
       );
       // version is not supported
       break;
@@ -75,7 +82,7 @@ export async function addCoveragePCOV(
         '$cross',
         'pcov',
         'PHP 7.1 or newer is required',
-        os_version
+        os
       );
       break;
   }
@@ -87,31 +94,20 @@ export async function addCoveragePCOV(
  * Function to disable Xdebug and PCOV
  *
  * @param version
- * @param os_version
+ * @param os
  * @param pipe
  */
 export async function disableCoverage(
   version: string,
-  os_version: string,
+  os: string,
   pipe: string
 ): Promise<string> {
   let script = '\n';
   script +=
-    (await extensions.addExtension(':pcov:false', version, os_version, true)) +
-    pipe;
+    (await extensions.addExtension(':pcov:false', version, os, true)) + pipe;
   script +=
-    (await extensions.addExtension(
-      ':xdebug:false',
-      version,
-      os_version,
-      true
-    )) + pipe;
-  script += await utils.addLog(
-    '$tick',
-    'none',
-    'Disabled Xdebug and PCOV',
-    os_version
-  );
+    (await extensions.addExtension(':xdebug:false', version, os, true)) + pipe;
+  script += await utils.addLog('$tick', 'none', 'Disabled Xdebug and PCOV', os);
 
   return script;
 }
@@ -121,31 +117,27 @@ export async function disableCoverage(
  *
  * @param coverage_driver
  * @param version
- * @param os_version
+ * @param os
  */
 export async function addCoverage(
   coverage_driver: string,
   version: string,
-  os_version: string
+  os: string
 ): Promise<string> {
   coverage_driver = coverage_driver.toLowerCase();
-  const script: string =
-    '\n' + (await utils.stepLog('Setup Coverage', os_version));
-  const pipe: string = (await utils.suppressOutput(os_version)) + '\n';
+  const script: string = '\n' + (await utils.stepLog('Setup Coverage', os));
+  const pipe: string = (await utils.suppressOutput(os)) + '\n';
   switch (coverage_driver) {
     case 'pcov':
-      return script + (await addCoveragePCOV(version, os_version, pipe));
+      return script + (await addCoveragePCOV(version, os, pipe));
     case 'xdebug':
-    case 'xdebug3':
-      return (
-        script + (await addCoverageXdebug('xdebug', version, os_version, pipe))
-      );
     case 'xdebug2':
+    case 'xdebug3':
       return (
-        script + (await addCoverageXdebug('xdebug2', version, os_version, pipe))
+        script + (await addCoverageXdebug(coverage_driver, version, os, pipe))
       );
     case 'none':
-      return script + (await disableCoverage(version, os_version, pipe));
+      return script + (await disableCoverage(version, os, pipe));
     default:
       return '';
   }