Update Node.js dependenices

Remove semver override

Bump version to 2.25.5

.github/CONTRIBUTING.md

@@ -71,6 +71,7 @@ npm test
 Creating a release means compiling all the TypeScript code to a single file which `setup-php` can run. Run this, before you push your changes.
 
 ```bash
+npm run build
 npm run release
 ```
 

README.md

@@ -224,7 +224,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string`
 
 These tools can be set up globally using the `tools` input. It accepts a string in csv-format.
 
-[`behat`], [`blackfire`], [`blackfire-player`], [`churn`], [`codeception`], [`composer`], [`composer-normalize`], [`composer-prefetcher`], [`composer-require-checker`], [`composer-unused`], [`cs2pr`], [`deployer`], [`flex`], [`grpc_php_plugin`], [`infection`], [`parallel-lint`], [`pecl`], [`phan`], [`phing`], [`phinx`], [`phive`], [`php-config`], [`php-cs-fixer`], [`phpcbf`], [`phpcpd`], [`phpcs`], [`phpdoc`] or [`phpDocumentor`], [`phpize`], [`phplint`], [`phpmd`], [`phpspec`], [`phpstan`], [`phpunit`], [`phpunit-bridge`], [`phpunit-polyfills`], [`pint`], [`prestissimo`], [`protoc`], [`psalm`], [`rector`], [`symfony`] or [`symfony-cli`], [`vapor`] or [`vapor-cli`], [`wp`] or [`wp-cli`]
+[`behat`], [`blackfire`], [`blackfire-player`], [`castor`], [`churn`], [`codeception`], [`composer`], [`composer-normalize`], [`composer-prefetcher`], [`composer-require-checker`], [`composer-unused`], [`cs2pr`], [`deployer`], [`flex`], [`grpc_php_plugin`], [`infection`], [`parallel-lint`], [`pecl`], [`phan`], [`phing`], [`phinx`], [`phive`], [`php-config`], [`php-cs-fixer`], [`phpcbf`], [`phpcpd`], [`phpcs`], [`phpdoc`] or [`phpDocumentor`], [`phpize`], [`phplint`], [`phpmd`], [`phpspec`], [`phpstan`], [`phpunit`], [`phpunit-bridge`], [`phpunit-polyfills`], [`pint`], [`prestissimo`], [`protoc`], [`psalm`], [`rector`], [`symfony`] or [`symfony-cli`], [`vapor`] or [`vapor-cli`], [`wp`] or [`wp-cli`]
 
 ```yaml
 - name: Setup PHP with tools
@@ -1028,6 +1028,7 @@ These companies generously provide setup-php their products and services to aid
 [`behat`]:                    https://docs.behat.org/en/latest/
 [`blackfire`]:                https://blackfire.io/docs/php/index
 [`blackfire-player`]:         https://blackfire.io/docs/builds-cookbooks/player
+[`castor`]:                   https://github.com/jolicode/castor
 [`churn`]:                    https://github.com/bmitch/churn-php
 [`codeception`]:              https://codeception.com/
 [`composer`]:                 https://getcomposer.org/

__tests__/extensions.test.ts

@@ -49,6 +49,7 @@ describe('Extension tests', () => {
     ${'http-1.2.3'}                              | ${'7.3'} | ${'add_http http-1.2.3'}
     ${'intl-65.1'}                               | ${'5.6'} | ${'add_intl intl-65.1'}
     ${'ioncube'}                                 | ${'7.3'} | ${'add_ioncube'}
+    ${'memcache-8.2'}                            | ${'8.2'} | ${'add_pecl_extension memcache 8.2 extension'}
     ${'mongodb-mongodb/mongo-php-driver@master'} | ${'7.3'} | ${'add_extension_from_source mongodb https://github.com mongodb mongo-php-driver master extension'}
     ${'oci8'}                                    | ${'7.3'} | ${'add_oci oci8'}
     ${'pcov'}                                    | ${'5.6'} | ${'add_log "$cross" "pcov" "pcov is not supported on PHP 5.6'}

__tests__/packagist.test.ts

@@ -0,0 +1,50 @@
+import * as packagist from '../src/packagist';
+import nock = require('nock');
+
+describe('search function', () => {
+  const mockResponse = {
+    packages: {
+      'test-package': [
+        {
+          require: {
+            php: '8.0.0'
+          },
+          version: '1.0.0'
+        },
+        {
+          version: '2.0.0'
+        }
+      ]
+    }
+  };
+
+  test('should return the version if matching php version is found', async () => {
+    nock('https://repo.packagist.org')
+      .get('/p2/test-package.json')
+      .reply(200, mockResponse);
+    const result = await packagist.search('test-package', '8.0');
+    expect(result).toBe('1.0.0');
+  });
+
+  test('should return null if no matching php version is found', async () => {
+    nock('https://repo.packagist.org')
+      .get('/p2/test-package.json')
+      .reply(200, mockResponse);
+    const result = await packagist.search('test-package', '5.6');
+    expect(result).toBeNull();
+  });
+
+  test('should return null if fetch fails', async () => {
+    nock('https://repo.packagist.org').get('/p2/test-package.json').reply(404);
+    const result = await packagist.search('test-package', '8.0');
+    expect(result).toBeNull();
+  });
+
+  test('should return null if the response is empty', async () => {
+    nock('https://repo.packagist.org')
+      .get('/p2/test-package.json')
+      .reply(200, {error: true, data: '[]'});
+    const result = await packagist.search('test-package', '8.0');
+    expect(result).toBeNull();
+  });
+});

__tests__/tools.test.ts

@@ -1,3 +1,4 @@
+import fs = require('fs');
 import * as tools from '../src/tools';
 
 interface IData {
@@ -70,6 +71,22 @@ jest.mock('../src/fetch', () => ({
     )
 }));
 
+jest.mock('../src/packagist', () => ({
+  search: jest
+    .fn()
+    .mockImplementation(
+      async (
+        package_name: string,
+        php_version: string
+      ): Promise<string | null> => {
+        if (package_name === 'phpunit/phpunit') {
+          return php_version + '.0';
+        }
+        return null;
+      }
+    )
+}));
+
 describe('Tools tests', () => {
   it.each`
     token              | version
@@ -387,7 +404,7 @@ describe('Tools tests', () => {
         'add_tool https://github.com/phpDocumentor/phpDocumentor/releases/latest/download/phpDocumentor.phar phpDocumentor "--version"',
         'add_composer_tool phplint phplint overtrue/',
         'add_tool https://github.com/phpstan/phpstan/releases/latest/download/phpstan.phar phpstan "-V"',
-        'add_tool https://phar.phpunit.de/phpunit.phar phpunit "--version"',
+        'add_tool https://phar.phpunit.de/phpunit-7.4.0.phar phpunit "--version"',
         'add_pecl',
         'add_tool https://www.phing.info/get/phing-latest.phar phing "-v"',
         'add_composer_tool phinx phinx robmorgan/ scoped',
@@ -510,10 +527,36 @@ describe('Tools tests', () => {
     }
   );
 
+  it.each`
+    version     | os           | uri
+    ${'latest'} | ${'linux'}   | ${'releases/latest/download/castor.linux-amd64.phar'}
+    ${'0.5.1'}  | ${'linux'}   | ${'releases/download/v0.5.1/castor.linux-amd64.phar'}
+    ${'latest'} | ${'darwin'}  | ${'releases/latest/download/castor.darwin-amd64.phar'}
+    ${'0.5.1'}  | ${'darwin'}  | ${'releases/download/v0.5.1/castor.darwin-amd64.phar'}
+    ${'latest'} | ${'win32'}   | ${'releases/latest/download/castor.windows-amd64.phar'}
+    ${'0.5.1'}  | ${'win32'}   | ${'releases/download/v0.5.1/castor.windows-amd64.phar castor -V'}
+    ${'latest'} | ${'openbsd'} | ${'Platform openbsd is not supported'}
+  `('checking addCastor: $version, $os', async ({version, os, uri}) => {
+    const data = getData({
+      tool: 'castor',
+      php_version: '8.1',
+      version_prefix: 'v',
+      version: version,
+      os: os
+    });
+    if (os === 'win32' && version === '0.5.1') {
+      fs.writeFileSync('castor.php', '');
+      expect(await tools.addCastor(data)).toContain(uri);
+      fs.unlinkSync('castor.php');
+    } else {
+      expect(await tools.addCastor(data)).toContain(uri);
+    }
+  });
+
   it.each`
     tools_csv                                             | script
     ${'none'}                                             | ${''}
-    ${'none, phpunit'}                                    | ${'\nstep_log "Setup Tools"\nadd_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-stable.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-stable.phar,https://getcomposer.org/composer-stable.phar composer latest\n\nadd_tool https://phar.phpunit.de/phpunit.phar phpunit "--version"'}
+    ${'none, phpunit'}                                    | ${'\nstep_log "Setup Tools"\nadd_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-stable.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-stable.phar,https://getcomposer.org/composer-stable.phar composer latest\n\nadd_tool https://phar.phpunit.de/phpunit-7.4.0.phar phpunit "--version"'}
     ${'composer:preview'}                                 | ${'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-preview.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-preview.phar,https://getcomposer.org/composer-preview.phar composer preview'}
     ${'composer, composer:v1'}                            | ${'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-1.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-1.phar,https://getcomposer.org/composer-1.phar composer'}
     ${'composer:v1, composer:preview, composer:snapshot'} | ${'add_tool https://github.com/shivammathur/composer-cache/releases/latest/download/composer-7.4-snapshot.phar,https://dl.cloudsmith.io/public/shivammathur/composer-cache/raw/files/composer-7.4-snapshot.phar,https://getcomposer.org/composer.phar composer snapshot'}
@@ -540,4 +583,22 @@ describe('Tools tests', () => {
     process.env['GITHUB_TOKEN'] = token;
     expect(await tools.addTools(tools_csv, '7.4', 'linux')).toContain(script);
   });
+
+  it.each`
+    tools_csv    | php_version | resolved
+    ${'phpunit'} | ${'8.2'}    | ${'/phpunit-8.2.0.phar'}
+    ${'phpunit'} | ${'8.1'}    | ${'/phpunit-8.1.0.phar'}
+    ${'phpunit'} | ${'8.0'}    | ${'/phpunit-8.0.0.phar'}
+    ${'phpunit'} | ${'7.3'}    | ${'/phpunit-7.3.0.phar'}
+    ${'phpunit'} | ${'7.2'}    | ${'/phpunit-7.2.0.phar'}
+    ${'phpunit'} | ${'7.1'}    | ${'/phpunit-7.1.0.phar'}
+    ${'phpunit'} | ${'7.0'}    | ${'/phpunit-7.0.0.phar'}
+  `(
+    'checking error: $tools_csv',
+    async ({tools_csv, php_version, resolved}) => {
+      expect(await tools.addTools(tools_csv, php_version, 'linux')).toContain(
+        resolved
+      );
+    }
+  );
 });

__tests__/utils.test.ts

@@ -1,4 +1,4 @@
-import fs from 'fs';
+import fs = require('fs');
 import * as path from 'path';
 import * as utils from '../src/utils';
 

dist/index.js

@@ -260,7 +260,7 @@ async function addExtensionDarwin(extension_csv, version) {
             case /.+-(stable|beta|alpha|devel|snapshot|rc|preview)/.test(extension):
                 add_script += await utils.joins('\nadd_unstable_extension', ext_name, ext_version, ext_prefix);
                 return;
-            case /.+-\d+\.\d+\.\d+.*/.test(extension):
+            case /.+-\d+(\.\d+\.\d+.*)?/.test(extension):
                 add_script += await utils.joins('\nadd_pecl_extension', ext_name, ext_version, ext_prefix);
                 return;
             case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
@@ -313,13 +313,13 @@ async function addExtensionWindows(extension_csv, version) {
             case /.+-.+\/.+@.+/.test(extension):
                 add_script += await utils.getUnsupportedLog(extension, version, 'win32');
                 break;
-            case /.+-\d+\.\d+\.\d+$/.test(extension):
-                add_script += await utils.joins('\nAdd-Extension', ext_name, 'stable', ext_version);
-                break;
             case /.+-\d+\.\d+\.\d+[a-zA-Z]+\d*/.test(extension):
                 matches = /.+-(\d+\.\d+\.\d+)([a-zA-Z]+)\d*/.exec(version_extension);
                 add_script += await utils.joins('\nAdd-Extension', ext_name, matches[2].replace('preview', 'devel'), matches[1]);
                 break;
+            case /.+-\d+(\.\d+\.\d+.*)?/.test(extension):
+                add_script += await utils.joins('\nAdd-Extension', ext_name, 'stable', ext_version);
+                break;
             case /7\.[2-4]xdebug2/.test(version_extension):
                 add_script += '\nAdd-Extension xdebug stable 2.9.8';
                 break;
@@ -379,7 +379,7 @@ async function addExtensionLinux(extension_csv, version) {
             case /.+-(stable|beta|alpha|devel|snapshot|rc|preview)/.test(extension):
                 add_script += await utils.joins('\nadd_unstable_extension', ext_name, ext_version, ext_prefix);
                 return;
-            case /.+-\d+\.\d+\.\d+.*/.test(extension):
+            case /.+-\d+(\.\d+\.\d+.*)?/.test(extension):
                 add_script += await utils.joins('\nadd_pecl_extension', ext_name, ext_version, ext_prefix);
                 return;
             case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
@@ -592,6 +592,64 @@ exports.run = run;
 
 /***/ }),
 
+/***/ 5151:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.search = void 0;
+const cv = __importStar(__nccwpck_require__(4773));
+const fetch = __importStar(__nccwpck_require__(2387));
+async function search(package_name, php_version) {
+    const response = await fetch.fetch(`https://repo.packagist.org/p2/${package_name}.json`);
+    if (response.error || response.data === '[]') {
+        return null;
+    }
+    const data = JSON.parse(response['data']);
+    if (data && data.packages) {
+        const versions = data.packages[package_name];
+        versions.sort((a, b) => cv.compareVersions(b.version, a.version));
+        const result = versions.find((versionData) => {
+            if (versionData?.require?.php) {
+                return versionData?.require?.php
+                    .split('|')
+                    .some(require => require && cv.satisfies(php_version + '.0', require));
+            }
+            return false;
+        });
+        return result ? result.version : null;
+    }
+    return null;
+}
+exports.search = search;
+//# sourceMappingURL=packagist.js.map
+
+/***/ }),
+
 /***/ 7740:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -624,10 +682,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.addTools = exports.functionRecord = exports.getData = exports.addWPCLI = exports.addPHPUnitTools = exports.addPhive = exports.addPhing = exports.addPECL = exports.addDevTools = exports.addDeployer = exports.addComposer = exports.addBlackfirePlayer = exports.addPackage = exports.addArchive = exports.getPharUrl = exports.getUrl = exports.filterList = exports.getRelease = exports.getVersion = exports.getLatestVersion = exports.getSemverVersion = void 0;
+exports.addTools = exports.functionRecord = exports.getData = exports.addWPCLI = exports.addPHPUnitTools = exports.addPhive = exports.addPhing = exports.addPECL = exports.addDevTools = exports.addDeployer = exports.addComposer = exports.addCastor = exports.addBlackfirePlayer = exports.addPackage = exports.addArchive = exports.getPharUrl = exports.getUrl = exports.filterList = exports.getRelease = exports.getVersion = exports.getLatestVersion = exports.getSemverVersion = void 0;
 const path_1 = __importDefault(__nccwpck_require__(1017));
 const fs_1 = __importDefault(__nccwpck_require__(7147));
 const fetch = __importStar(__nccwpck_require__(2387));
+const packagist = __importStar(__nccwpck_require__(5151));
 const utils = __importStar(__nccwpck_require__(918));
 async function getSemverVersion(data) {
     const search = data['version_prefix'] + data['version'];
@@ -778,6 +837,16 @@ async function addBlackfirePlayer(data) {
     return addArchive(data);
 }
 exports.addBlackfirePlayer = addBlackfirePlayer;
+async function addCastor(data) {
+    data['tool'] = 'castor.' + data['os'].replace('win32', 'windows') + '-amd64';
+    data['url'] = await getUrl(data);
+    data['tool'] = 'castor';
+    data['version_parameter'] = fs_1.default.existsSync('castor.php')
+        ? data['version_parameter']
+        : '';
+    return await addArchive(data);
+}
+exports.addCastor = addCastor;
 async function addComposer(data) {
     const channel = data['version'].replace('latest', 'stable');
     const github = data['github'];
@@ -885,6 +954,11 @@ async function addPhive(data) {
 }
 exports.addPhive = addPhive;
 async function addPHPUnitTools(data) {
+    if (data['version'] === 'latest') {
+        data['version'] =
+            (await packagist.search(data['packagist'], data['php_version'])) ??
+                'latest';
+    }
     data['url'] = await getPharUrl(data);
     return await addArchive(data);
 }
@@ -936,6 +1010,7 @@ async function getData(release, php_version, os) {
     data['extension'] ??= '.phar';
     data['os'] = os;
     data['php_version'] = php_version;
+    data['packagist'] ??= data['repository'];
     data['prefix'] = data['github'] === data['domain'] ? 'releases' : '';
     data['verb'] = data['github'] === data['domain'] ? 'download' : '';
     data['fetch_latest'] ??= 'false';
@@ -950,6 +1025,7 @@ async function getData(release, php_version, os) {
 }
 exports.getData = getData;
 exports.functionRecord = {
+    castor: addCastor,
     composer: addComposer,
     deployer: addDeployer,
     dev_tools: addDevTools,
@@ -1189,7 +1265,8 @@ async function CSVArray(values_csv) {
                     .trim()
                     .replace(/^["']|["']$|(?<==)["']/g, '')
                     .replace(/=(((?!E_).)*[?{}|&~![()^]+((?!E_).)+)/, "='$1'")
-                    .replace(/=(.*?)(=.*)/, "='$1$2'");
+                    .replace(/=(.*?)(=.*)/, "='$1$2'")
+                    .replace(/:\s*["'](.*?)/g, ':$1');
             })
                 .filter(Boolean);
     }
@@ -4302,6 +4379,212 @@ function copyFile(srcFile, destFile, force) {
 }
 //# sourceMappingURL=io.js.map
 
+/***/ }),
+
+/***/ 4773:
+/***/ (function(__unused_webpack_module, exports) {
+
+(function (global, factory) {
+     true ? factory(exports) :
+    0;
+})(this, (function (exports) { 'use strict';
+
+    const semver = /^[v^~<>=]*?(\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+))?(?:-([\da-z\-]+(?:\.[\da-z\-]+)*))?(?:\+[\da-z\-]+(?:\.[\da-z\-]+)*)?)?)?$/i;
+    const validateAndParse = (version) => {
+        if (typeof version !== 'string') {
+            throw new TypeError('Invalid argument expected string');
+        }
+        const match = version.match(semver);
+        if (!match) {
+            throw new Error(`Invalid argument not valid semver ('${version}' received)`);
+        }
+        match.shift();
+        return match;
+    };
+    const isWildcard = (s) => s === '*' || s === 'x' || s === 'X';
+    const tryParse = (v) => {
+        const n = parseInt(v, 10);
+        return isNaN(n) ? v : n;
+    };
+    const forceType = (a, b) => typeof a !== typeof b ? [String(a), String(b)] : [a, b];
+    const compareStrings = (a, b) => {
+        if (isWildcard(a) || isWildcard(b))
+            return 0;
+        const [ap, bp] = forceType(tryParse(a), tryParse(b));
+        if (ap > bp)
+            return 1;
+        if (ap < bp)
+            return -1;
+        return 0;
+    };
+    const compareSegments = (a, b) => {
+        for (let i = 0; i < Math.max(a.length, b.length); i++) {
+            const r = compareStrings(a[i] || '0', b[i] || '0');
+            if (r !== 0)
+                return r;
+        }
+        return 0;
+    };
+
+    /**
+     * Compare [semver](https://semver.org/) version strings to find greater, equal or lesser.
+     * This library supports the full semver specification, including comparing versions with different number of digits like `1.0.0`, `1.0`, `1`, and pre-release versions like `1.0.0-alpha`.
+     * @param v1 - First version to compare
+     * @param v2 - Second version to compare
+     * @returns Numeric value compatible with the [Array.sort(fn) interface](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#Parameters).
+     */
+    const compareVersions = (v1, v2) => {
+        // validate input and split into segments
+        const n1 = validateAndParse(v1);
+        const n2 = validateAndParse(v2);
+        // pop off the patch
+        const p1 = n1.pop();
+        const p2 = n2.pop();
+        // validate numbers
+        const r = compareSegments(n1, n2);
+        if (r !== 0)
+            return r;
+        // validate pre-release
+        if (p1 && p2) {
+            return compareSegments(p1.split('.'), p2.split('.'));
+        }
+        else if (p1 || p2) {
+            return p1 ? -1 : 1;
+        }
+        return 0;
+    };
+
+    /**
+     * Compare [semver](https://semver.org/) version strings using the specified operator.
+     *
+     * @param v1 First version to compare
+     * @param v2 Second version to compare
+     * @param operator Allowed arithmetic operator to use
+     * @returns `true` if the comparison between the firstVersion and the secondVersion satisfies the operator, `false` otherwise.
+     *
+     * @example
+     * ```
+     * compare('10.1.8', '10.0.4', '>'); // return true
+     * compare('10.0.1', '10.0.1', '='); // return true
+     * compare('10.1.1', '10.2.2', '<'); // return true
+     * compare('10.1.1', '10.2.2', '<='); // return true
+     * compare('10.1.1', '10.2.2', '>='); // return false
+     * ```
+     */
+    const compare = (v1, v2, operator) => {
+        // validate input operator
+        assertValidOperator(operator);
+        // since result of compareVersions can only be -1 or 0 or 1
+        // a simple map can be used to replace switch
+        const res = compareVersions(v1, v2);
+        return operatorResMap[operator].includes(res);
+    };
+    const operatorResMap = {
+        '>': [1],
+        '>=': [0, 1],
+        '=': [0],
+        '<=': [-1, 0],
+        '<': [-1],
+        '!=': [-1, 1],
+    };
+    const allowedOperators = Object.keys(operatorResMap);
+    const assertValidOperator = (op) => {
+        if (typeof op !== 'string') {
+            throw new TypeError(`Invalid operator type, expected string but got ${typeof op}`);
+        }
+        if (allowedOperators.indexOf(op) === -1) {
+            throw new Error(`Invalid operator, expected one of ${allowedOperators.join('|')}`);
+        }
+    };
+
+    /**
+     * Match [npm semver](https://docs.npmjs.com/cli/v6/using-npm/semver) version range.
+     *
+     * @param version Version number to match
+     * @param range Range pattern for version
+     * @returns `true` if the version number is within the range, `false` otherwise.
+     *
+     * @example
+     * ```
+     * satisfies('1.1.0', '^1.0.0'); // return true
+     * satisfies('1.1.0', '~1.0.0'); // return false
+     * ```
+     */
+    const satisfies = (version, range) => {
+        // clean input
+        range = range.replace(/([><=]+)\s+/g, '$1');
+        // handle multiple comparators
+        if (range.includes('||')) {
+            return range.split('||').some((r) => satisfies(version, r));
+        }
+        else if (range.includes(' - ')) {
+            const [a, b] = range.split(' - ', 2);
+            return satisfies(version, `>=${a} <=${b}`);
+        }
+        else if (range.includes(' ')) {
+            return range
+                .trim()
+                .replace(/\s{2,}/g, ' ')
+                .split(' ')
+                .every((r) => satisfies(version, r));
+        }
+        // if no range operator then "="
+        const m = range.match(/^([<>=~^]+)/);
+        const op = m ? m[1] : '=';
+        // if gt/lt/eq then operator compare
+        if (op !== '^' && op !== '~')
+            return compare(version, range, op);
+        // else range of either "~" or "^" is assumed
+        const [v1, v2, v3, , vp] = validateAndParse(version);
+        const [r1, r2, r3, , rp] = validateAndParse(range);
+        const v = [v1, v2, v3];
+        const r = [r1, r2 !== null && r2 !== void 0 ? r2 : 'x', r3 !== null && r3 !== void 0 ? r3 : 'x'];
+        // validate pre-release
+        if (rp) {
+            if (!vp)
+                return false;
+            if (compareSegments(v, r) !== 0)
+                return false;
+            if (compareSegments(vp.split('.'), rp.split('.')) === -1)
+                return false;
+        }
+        // first non-zero number
+        const nonZero = r.findIndex((v) => v !== '0') + 1;
+        // pointer to where segments can be >=
+        const i = op === '~' ? 2 : nonZero > 1 ? nonZero : 1;
+        // before pointer must be equal
+        if (compareSegments(v.slice(0, i), r.slice(0, i)) !== 0)
+            return false;
+        // after pointer must be >=
+        if (compareSegments(v.slice(i), r.slice(i)) === -1)
+            return false;
+        return true;
+    };
+
+    /**
+     * Validate [semver](https://semver.org/) version strings.
+     *
+     * @param version Version number to validate
+     * @returns `true` if the version number is a valid semver version number, `false` otherwise.
+     *
+     * @example
+     * ```
+     * validate('1.0.0-rc.1'); // return true
+     * validate('1.0-rc.1'); // return false
+     * validate('foo'); // return false
+     * ```
+     */
+    const validate = (version) => typeof version === 'string' && /^[v\d]/.test(version) && semver.test(version);
+
+    exports.compare = compare;
+    exports.compareVersions = compareVersions;
+    exports.satisfies = satisfies;
+    exports.validate = validate;
+
+}));
+//# sourceMappingURL=index.js.map
+
+
 /***/ }),
 
 /***/ 4294:

examples/sage.yml

@@ -9,7 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         php-versions: ['7.4', '8.0', '8.1']
-        node-versions: [16']
+        node-versions: ['16']
     steps:
       - name: Checkout
         uses: actions/checkout@v3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "2.25.0",
+  "version": "2.25.5",
   "private": false,
   "description": "Setup PHP for use with GitHub Actions",
   "main": "lib/install.js",
@@ -36,26 +36,27 @@
   "dependencies": {
     "@actions/core": "^1.10.0",
     "@actions/exec": "^1.1.1",
-    "@actions/io": "^1.1.3"
+    "@actions/io": "^1.1.3",
+    "compare-versions": "^6.0.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.0",
+    "@types/jest": "^29.5.3",
-    "@types/node": "^18.15.11",
+    "@types/node": "^20.4.5",
-    "@typescript-eslint/eslint-plugin": "^5.58.0",
+    "@typescript-eslint/eslint-plugin": "^6.2.0",
-    "@typescript-eslint/parser": "^5.58.0",
+    "@typescript-eslint/parser": "^6.2.0",
     "@vercel/ncc": "^0.36.1",
-    "eslint": "^8.38.0",
+    "eslint": "^8.46.0",
-    "eslint-config-prettier": "^8.8.0",
+    "eslint-config-prettier": "^8.9.0",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-import": "^2.28.0",
-    "eslint-plugin-jest": "^27.2.1",
+    "eslint-plugin-jest": "^27.2.3",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-prettier": "^5.0.0",
-    "jest": "^29.5.0",
+    "jest": "^29.6.2",
-    "jest-circus": "^29.5.0",
+    "jest-circus": "^29.6.2",
-    "nock": "^13.3.0",
+    "nock": "^13.3.2",
-    "prettier": "^2.8.7",
+    "prettier": "^3.0.0",
-    "simple-git-hooks": "^2.8.1",
+    "simple-git-hooks": "^2.9.0",
-    "ts-jest": "^29.1.0",
+    "ts-jest": "^29.1.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.1.6"
   },
   "bugs": {
     "url": "https://github.com/shivammathur/setup-php/issues"

src/configs/mod_priority

@@ -2,12 +2,15 @@ apc=25
 apcu_bc=25
 apcu-bc=25
 blackfire=30
+couchbase=30
 decimal=30
 ds=30
+event=30
 grpc=30
 http=25
 pecl_http=25
 pecl-http=25
+psr=15
 inotify=30
 libvirt-php=40
 mailparse=25

src/configs/tools.json

@@ -222,6 +222,14 @@
     "version_prefix": "v",
     "version_parameter": "-V"
   },
+  "castor": {
+    "type": "custom-function",
+    "domain": "https://github.com",
+    "repository": "jolicode/castor",
+    "function": "castor",
+    "version_prefix": "v",
+    "version_parameter": "-V"
+  },
   "composer": {
     "type": "custom-function",
     "domain": "https://getcomposer.org",
@@ -268,6 +276,7 @@
   "phpunit": {
     "type": "custom-function",
     "repository": "sebastianbergmann/phpunit",
+    "packagist": "phpunit/phpunit",
     "domain": "https://phar.phpunit.de",
     "function": "phpunit",
     "version_prefix": "",

src/configs/tools_schema.json

@@ -13,6 +13,7 @@
         "fetch_latest": "true",
         "function": "function_name",
         "repository": "user/tool",
+        "packagist": "user/tool",
         "scope": "global, scoped",
         "type": "phar, composer, custom-package or custom-function",
         "version_parameter": "--version",
@@ -77,6 +78,15 @@
           "user/tool"
         ]
       },
+      "packagist": {
+        "$id": "#/items/properties/packagist",
+        "type": "string",
+        "title": "The repository schema",
+        "description": "Packagist repository of the tool in case different from repository.",
+        "examples": [
+          "user/tool"
+        ]
+      },
       "scope": {
         "$id": "#/items/properties/scope",
         "type": "string",

src/extensions.ts

@@ -70,7 +70,7 @@ export async function addExtensionDarwin(
         );
         return;
       // match semver
-      case /.+-\d+\.\d+\.\d+.*/.test(extension):
+      case /.+-\d+(\.\d+\.\d+.*)?/.test(extension):
         add_script += await utils.joins(
           '\nadd_pecl_extension',
           ext_name,
@@ -176,15 +176,6 @@ export async function addExtensionWindows(
           'win32'
         );
         break;
-      // match semver without state
-      case /.+-\d+\.\d+\.\d+$/.test(extension):
-        add_script += await utils.joins(
-          '\nAdd-Extension',
-          ext_name,
-          'stable',
-          ext_version
-        );
-        break;
       // match semver with state
       case /.+-\d+\.\d+\.\d+[a-zA-Z]+\d*/.test(extension):
         matches = /.+-(\d+\.\d+\.\d+)([a-zA-Z]+)\d*/.exec(
@@ -197,6 +188,15 @@ export async function addExtensionWindows(
           matches[1]
         );
         break;
+      // match semver without state
+      case /.+-\d+(\.\d+\.\d+.*)?/.test(extension):
+        add_script += await utils.joins(
+          '\nAdd-Extension',
+          ext_name,
+          'stable',
+          ext_version
+        );
+        break;
       // match 7.2xdebug2 to 7.4xdebug2
       case /7\.[2-4]xdebug2/.test(version_extension):
         add_script += '\nAdd-Extension xdebug stable 2.9.8';
@@ -306,7 +306,7 @@ export async function addExtensionLinux(
         );
         return;
       // match semver versions
-      case /.+-\d+\.\d+\.\d+.*/.test(extension):
+      case /.+-\d+(\.\d+\.\d+.*)?/.test(extension):
         add_script += await utils.joins(
           '\nadd_pecl_extension',
           ext_name,

src/packagist.ts

@@ -0,0 +1,37 @@
+import * as cv from 'compare-versions';
+import * as fetch from './fetch';
+
+type RS = Record<string, string>;
+type RSRS = Record<string, RS>;
+
+export async function search(
+  package_name: string,
+  php_version: string
+): Promise<string | null> {
+  const response = await fetch.fetch(
+    `https://repo.packagist.org/p2/${package_name}.json`
+  );
+  if (response.error || response.data === '[]') {
+    return null;
+  }
+
+  const data = JSON.parse(response['data']);
+  if (data && data.packages) {
+    const versions = data.packages[package_name];
+    versions.sort((a: RS, b: RS) => cv.compareVersions(b.version, a.version));
+
+    const result = versions.find((versionData: RSRS) => {
+      if (versionData?.require?.php) {
+        return versionData?.require?.php
+          .split('|')
+          .some(
+            require => require && cv.satisfies(php_version + '.0', require)
+          );
+      }
+      return false;
+    });
+
+    return result ? result.version : null;
+  }
+  return null;
+}

src/scripts/darwin.sh

@@ -104,6 +104,15 @@ link_libraries() {
   done
 }
 
+# Link opcache extension to extensions directory.
+link_opcache() {
+  opcache_ini="$brew_prefix"/etc/php/"$version"/conf.d/ext-opcache.ini
+  if [ -e "$opcache_ini" ]; then
+    opcache_ext=$(grep -Eo "zend_extension.*opcache.*\.so" "$opcache_ini" | cut -d '"' -f 2)
+    sudo ln -sf "$opcache_ext" "$ext_dir"
+  fi
+}
+
 # Patch brew to overwrite packages.
 patch_brew() {
   formula_installer="${brew_repo:?}"/Library/Homebrew/formula_installer.rb
@@ -233,6 +242,7 @@ setup_php() {
   semver="$(php_semver)"
   extra_version="$(php_extra_version)"
   configure_php
+  link_opcache
   set_output "php-version" "$semver"
   if [ "${semver%.*}" != "$version" ]; then
     add_log "${cross:?}" "PHP" "Could not setup PHP $version"

src/scripts/extensions/add_extensions.sh

@@ -49,6 +49,7 @@ enable_extension() {
     enable_extension_dependencies "$1" "$2"
     enable_cache_extension_dependencies "$1" "$2"
     if ! [[ "${version:?}" =~ ${old_versions:?} ]] && command -v phpenmod >/dev/null 2>&1; then
+      sudo sed -Ei "/=(.*\/)?\"?$extension(.so)?\"?$/d" "$pecl_file"
       mod="${ini_dir:?}"/../mods-available/"$1".ini
       if ! [ -e "$mod" ]; then
         priority="${3:-20}";
@@ -134,7 +135,6 @@ configure_pecl() {
   [ -z "${pecl_file:-${ini_file[@]}}" ] && return
   if ! [ -e /tmp/pecl_config ]; then
     for script in pear pecl; do
-      sudo "$script" config-set php_ini "${pecl_file:-${ini_file[@]}}"
       sudo "$script" channel-update "$script".php.net
     done
     echo '' | sudo tee /tmp/pecl_config >/dev/null 2>&1
@@ -174,17 +174,23 @@ get_pecl_version() {
 # Function to install PECL extensions and accept default options
 pecl_install() {
   local extension=$1
+  local prefix=${2:-extension}
   add_pecl >/dev/null 2>&1
   cpu_count="$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo '1')"
   prefix_opts="$(parse_args "$extension" CONFIGURE_PREFIX_OPTS) MAKEFLAGS='-j $cpu_count'"
   suffix_opts="$(parse_args "$extension" CONFIGURE_OPTS) $(parse_args "$extension" CONFIGURE_SUFFIX_OPTS)"
   IFS=' ' read -r -a libraries <<<"$(parse_args "$extension" LIBS) $(parse_args "$extension" "$(uname -s)"_LIBS)"
   (( ${#libraries[@]} )) && add_libs "${libraries[@]}" >/dev/null 2>&1
+  disable_extension_helper "${extension%-*}" >/dev/null 2>&1
   if [ "$version" = "5.3" ]; then
     yes '' 2>/dev/null | sudo "$prefix_opts" pecl install -f "$extension" >/dev/null 2>&1
   else
     yes '' 2>/dev/null | sudo "$prefix_opts" pecl install -f -D "$(parse_pecl_configure_options "$suffix_opts")" "$extension" >/dev/null 2>&1
   fi
+  local exit_code=$?
+  sudo pecl info "$extension" | grep -iq 'zend extension' && prefix=zend_extension
+  enable_extension "${extension%-*}" "$prefix"
+  return "$exit_code"
 }
 
 # Function to install a specific version of PECL extension.
@@ -200,7 +206,6 @@ add_pecl_extension() {
   if [ "${ext_version/-/}" = "$pecl_version" ]; then
     add_log "${tick:?}" "$extension" "Enabled"
   else
-    disable_extension_helper "$extension" >/dev/null 2>&1
     [ -n "$pecl_version" ] && pecl_version="-$pecl_version"
     pecl_install "$extension$pecl_version" || add_extension "$extension" "$(get_extension_prefix "$extension")" >/dev/null 2>&1
     extension_version="$(php -r "echo phpversion('$extension');")"

src/scripts/extensions/intl.sh

@@ -15,8 +15,9 @@ add_intl() {
   if [ "$icu" != "$supported_version" ]; then
     add_log "${cross:?}" "intl" "ICU $icu is not supported"
   else
+    [ "${ts:?}" = 'zts' ] && suffix='-zts'
     install_icu "$icu" >/dev/null 2>&1
-    get -q -n "${ext_dir:?}/intl.so" "https://github.com/shivammathur/icu-intl/releases/download/intl/php${version:?}-intl-$icu.so"
+    get -q -n "${ext_dir:?}/intl.so" "https://github.com/shivammathur/icu-intl/releases/download/intl/php${version:?}-intl-$icu$suffix.so"
     enable_extension intl extension
     add_extension_log intl "Installed and enabled with ICU $icu"
   fi

src/scripts/linux.sh

@@ -34,8 +34,8 @@ disable_extension_helper() {
   if [ "$disable_dependents" = "true" ]; then
     disable_extension_dependents "$extension"
   fi
-  sudo sed -Ei "/=(.*\/)?\"?$extension(.so)?$/d" "${ini_file[@]}" "$pecl_file"
+  sudo sed -Ei "/=(.*\/)?\"?$extension(.so)?\"?$/d" "${ini_file[@]}" "$pecl_file"
-  sudo find "$ini_dir"/.. -name "*$extension.ini" -not -path "*phar.ini" -not -path "*pecl.ini" -not -path "*mods-available*" -delete >/dev/null 2>&1 || true
+  sudo find "$ini_dir"/.. -name "*-$extension.ini" -not -path "*phar.ini" -not -path "*pecl.ini" -not -path "*mods-available*" -delete >/dev/null 2>&1 || true
   sudo rm -f /tmp/php"$version"_extensions
   mkdir -p /tmp/extdisabled/"$version"
   echo '' | sudo tee /tmp/extdisabled/"$version"/"$extension" >/dev/null 2>&1

src/scripts/tools/add_tools.ps1

@@ -57,7 +57,7 @@ Function Get-ToolVersion() {
   Param (
     [Parameter(Position = 0, Mandatory = $true)]
     $tool,
-    [Parameter(Position = 1, Mandatory = $true)]
+    [Parameter(Position = 1, Mandatory = $false)]
     $param
   )
   $alp = "[a-zA-Z0-9\.]"
@@ -72,7 +72,9 @@ Function Get-ToolVersion() {
     Set-Variable -Name 'composer_version' -Value $composer_version -Scope Global
     return "$composer_version"
   }
-  return . $tool $param 2> $null | ForEach-Object { $_ -replace "composer $version_regex", '' } | Select-String -Pattern $version_regex | Select-Object -First 1 | ForEach-Object { $_.matches.Value }
+  if($null -ne $param) {
+    return . $tool $param 2> $null | ForEach-Object { $_ -replace "composer $version_regex", '' } | Select-String -Pattern $version_regex | Select-Object -First 1 | ForEach-Object { $_.matches.Value }
+  }
 }
 
 # Helper function to configure tools.
@@ -135,8 +137,7 @@ Function Add-Tool() {
     [Parameter(Position = 1, Mandatory = $true)]
     [ValidateNotNull()]
     $tool,
-    [Parameter(Position = 2, Mandatory = $true)]
+    [Parameter(Position = 2, Mandatory = $false)]
-    [ValidateNotNull()]
     $ver_param
   )
   if (Test-Path $bin_dir\$tool) {

src/scripts/tools/add_tools.sh

@@ -19,7 +19,7 @@ get_tool_version() {
       composer_version="$(grep -Ea "const\sVERSION" "$tool_path_dir/composer" | grep -Eo "$version_regex")"
     fi
     echo "$composer_version" | sudo tee /tmp/composer_version
-  else
+  elif [ -n "$param" ]; then
     $tool "$param" 2>/dev/null | sed -Ee "s/[Cc]omposer(.)?$version_regex//g" | grep -Eo "$version_regex" | head -n 1
   fi
 }

src/scripts/tools/ppa.sh

@@ -31,10 +31,6 @@ set_base_version() {
   else
     set_base_version_codename
     set_base_version_id
-
-    # Remove once PPAs start having bookworm releases
-    [ "$VERSION_CODENAME" = 'bookworm' ] && VERSION_CODENAME="bullseye"
-
     printf "ID=%s\nVERSION_ID=%s\nVERSION_CODENAME=%s\n" "$ID" "$VERSION_ID" "$VERSION_CODENAME" | tee /tmp/os-release >/dev/null 2>&1
   fi
 }
@@ -59,7 +55,7 @@ update_lists() {
   if [[ -n "$ppa" && -n "$ppa_search" ]]; then
     list="$list_dir"/"$(basename "$(grep -lr "$ppa_search" "$list_dir")")"
     status_file=/tmp/"${ppa/\//_}"
-  elif grep -Eq '^deb ' "$list_file"; then
+  elif [ -e "$list_file" ] && grep -Eq '^deb ' "$list_file"; then
     list="$list_file"
   fi
   if [ ! -e "$status_file" ]; then

src/scripts/unix.sh

@@ -53,7 +53,7 @@ read_env() {
   [ "${debug:-${DEBUG:-false}}" = "true" ] && debug=debug && update=true || debug=release
   [ "${phpts:-${PHPTS:-nts}}" = "ts" ] && ts=zts && update=true || ts=nts
   fail_fast="${fail_fast:-${FAIL_FAST:-false}}"
-  [[ -z "${ImageOS}" && -z "${ImageVersion}" ]] && _runner=self-hosted || _runner=github
+  [[ -z "${ImageOS}" && -z "${ImageVersion}" || -n ${ACT} ]] && _runner=self-hosted || _runner=github
   runner="${runner:-${RUNNER:-$_runner}}"
 
   if [[ "$runner" = "github" && $_runner = "self-hosted" ]]; then

src/scripts/win32.ps1

@@ -281,13 +281,22 @@ Function Set-PhpCache {
 
 # Function to add debug symbols to PHP.
 Function Add-DebugSymbols {
-  $release = Invoke-RestMethod https://api.github.com/repos/shivammathur/php-builder-windows/releases/tags/php$version
   $dev = if ($version -match $nightly_versions) { '-dev' } else { '' }
-  $asset = $release.assets | ForEach-Object {
+  try {
-    if($_.name -match "php-debug-pack-$version.[0-9]+$dev$env:PHPTS-Win32-.*-$arch.zip") {
+    $release = Invoke-RestMethod https://api.github.com/repos/shivammathur/php-builder-windows/releases/tags/php$version
-      return $_.name
+    $asset = $release.assets | ForEach-Object {
-    }
+      if($_.name -match "php-debug-pack-$version.[0-9]+$dev$env:PHPTS-Win32-.*-$arch.zip") {
-  } | Select-Object -Last 1
+        return $_.name
+      }
+    } | Select-Object -Last 1
+  } catch {
+    $release = Get-File -Url $php_builder/releases/expanded_assets/php$version
+    $asset = $release.links.href | ForEach-Object {
+      if($_ -match "php-debug-pack-$version.[0-9]+$dev$env:PHPTS-Win32-.*-$arch.zip") {
+        return $_.split('/')[-1]
+      }
+    } | Select-Object -Last 1
+  }
   Get-File -Url $php_builder/releases/download/php$version/$asset -OutFile $php_dir\$asset
   Expand-Archive -Path $php_dir\$asset -DestinationPath $php_dir -Force
   Get-ChildItem -Path $php_dir -Filter php_*.pdb | Move-Item -Destination $ext_dir

src/tools.ts

@@ -1,6 +1,7 @@
 import path from 'path';
 import fs from 'fs';
 import * as fetch from './fetch';
+import * as packagist from './packagist';
 import * as utils from './utils';
 
 type RS = Record<string, string>;
@@ -229,6 +230,21 @@ export async function addBlackfirePlayer(data: RS): Promise<string> {
   return addArchive(data);
 }
 
+/**
+ * Function to add Castor
+ *
+ * @param data
+ */
+export async function addCastor(data: RS): Promise<string> {
+  data['tool'] = 'castor.' + data['os'].replace('win32', 'windows') + '-amd64';
+  data['url'] = await getUrl(data);
+  data['tool'] = 'castor';
+  data['version_parameter'] = fs.existsSync('castor.php')
+    ? data['version_parameter']
+    : '';
+  return await addArchive(data);
+}
+
 /**
  * Function to add composer
  *
@@ -392,6 +408,11 @@ export async function addPhive(data: RS): Promise<string> {
  * @param data
  */
 export async function addPHPUnitTools(data: RS): Promise<string> {
+  if (data['version'] === 'latest') {
+    data['version'] =
+      (await packagist.search(data['packagist'], data['php_version'])) ??
+      'latest';
+  }
   data['url'] = await getPharUrl(data);
   return await addArchive(data);
 }
@@ -458,6 +479,7 @@ export async function getData(
   data['extension'] ??= '.phar';
   data['os'] = os;
   data['php_version'] = php_version;
+  data['packagist'] ??= data['repository'];
   data['prefix'] = data['github'] === data['domain'] ? 'releases' : '';
   data['verb'] = data['github'] === data['domain'] ? 'download' : '';
   data['fetch_latest'] ??= 'false';
@@ -472,6 +494,7 @@ export async function getData(
 }
 
 export const functionRecord: Record<string, (data: RS) => Promise<string>> = {
+  castor: addCastor,
   composer: addComposer,
   deployer: addDeployer,
   dev_tools: addDevTools,

src/utils.ts

@@ -249,7 +249,8 @@ export async function CSVArray(values_csv: string): Promise<Array<string>> {
             .trim()
             .replace(/^["']|["']$|(?<==)["']/g, '')
             .replace(/=(((?!E_).)*[?{}|&~![()^]+((?!E_).)+)/, "='$1'")
-            .replace(/=(.*?)(=.*)/, "='$1$2'");
+            .replace(/=(.*?)(=.*)/, "='$1$2'")
+            .replace(/:\s*["'](.*?)/g, ':$1');
         })
         .filter(Boolean);
   }