Compare commits

..
30 Commits
Author SHA1 Message Date
Shivam Mathur 1fa3ba1b16 Fix php_extra_version on macOS 2021-09-19 03:58:05 +05:30
Shivam Mathur d8d1da5d6d Fix version for PECL extensions in logs 2021-09-19 03:17:13 +05:30
Shivam Mathur 094bc8ae17 Fix parsing php-src tag 2021-09-19 02:54:02 +05:30
Shivam Mathur 48aac87d46 Fix setup for cached OCI extensions 2021-09-19 02:41:04 +05:30
Shivam Mathur 31971c78cd Fix parsing extra version 2021-09-19 02:38:31 +05:30
Shivam Mathur 13760f5b16 Add support for expect and ssh2 using shivammathur/extensions tap on macOS 2021-09-16 18:41:02 +05:30
Shivam Mathur c644f654ce Add check for package files when adding PPA 2021-09-15 00:25:36 +05:30
Shivam Mathur 9adda12e86 Add automated single SVG for corporate sponsors 2021-09-14 00:03:18 +05:30
Shivam Mathur 6db8a6c378 Improve docs for extensions: none 2021-09-13 19:55:06 +05:30
Shivam Mathur a34eeedd37 Bump version to 2.14.0
Add config to generate types

Fix build error in install.ts after TypeScript upgrade

Minor refactor in install.test.ts

Add bugs, directories, files and types entries in package.json

Update Node.js dependencies

Update SECURITY.md
2021-09-11 05:25:45 +05:30
Shivam Mathur 35bc046b26 Improve documentation for disabling extensions 2021-09-11 05:25:43 +05:30
Shivam Mathur 64e9bb0e79 Add special cases to config.test.ts 2021-09-09 07:19:49 +05:30
Shivam Mathur 19a01870e7 Refactor config.test.ts 2021-09-09 07:08:12 +05:30
Shivam Mathur c4560dd084 Refactor coverage.test.ts 2021-09-09 06:54:17 +05:30
Shivam Mathur 0313f578ce Add sponsor svg 2021-09-08 12:19:06 +05:30
Shivam Mathur d068c17d9e Add support for nightly alias 2021-09-06 11:58:31 +05:30
Shivam Mathur 8eebeae48a Use commit hash in url for nightly builds in darwin.sh 2021-09-05 12:32:28 +05:30
Shivam Mathur da9dadf09c Fix parsing 8.1 version 2021-09-02 19:24:08 +05:30
Shivam Mathur e06e40278f Specify version in Windows nightly setup 2021-09-02 00:35:19 +05:30
Shivam Mathur 6473b1c04c Add 8.2 to the workflows 2021-09-02 00:18:50 +05:30
Shivam Mathur 7694412cb0 Update documentation for PHP 8.2.0-dev 2021-09-01 19:34:48 +05:30
Shivam Mathur e990e98a54 Use shivammathur/extensions tap to install vips on macOS 2021-09-01 15:53:05 +05:30
Shivam Mathur b2d037d560 Add support to remove all shared extensions 2021-08-28 12:17:23 +05:30
Shivam Mathur 4beeea41b4 Fix logs of disabled dependent extensions
Use shared_extension function on unix
2021-08-28 12:17:22 +05:30
Shivam Mathur 8e80635955 Fix parsing extensions input if Zend OPcache is specified instead of opcache 2021-08-28 12:17:21 +05:30
Shivam Mathur c8837583fc Do not check dependents for PCOV and Xdebug 2021-08-28 12:17:21 +05:30
Shivam Mathur bb36513e49 Add support to disable dependent extensions 2021-08-28 12:17:20 +05:30
Shivam Mathur 5402397d9f Do not delete extensions, just disable them 2021-08-28 12:17:19 +05:30
Shivam Mathur f6b4601c63 Run New-Item with -Force as items can pre-exist on self-hosted environments
Pipe output to $null as that is removed for verbose and not Out-Null, and is also faster
2021-08-28 12:17:18 +05:30
Shivam Mathur ed62711289 Update sponsor options [skip ci] 2021-08-28 12:14:51 +05:30
32 changed files with 1323 additions and 1112 deletions
+1 -5
View File
@@ -1,7 +1,3 @@
# These are supported funding model platforms # These are supported funding model platforms
open_collective: setup-php github: shivammathur
tidelift: "npm/setup-php"
community_bridge: setup-php
patreon: shivammathur
custom: https://www.paypal.me/shivammathur
+2 -1
View File
@@ -7,7 +7,7 @@ The following versions of this project are supported for security updates.
| Version | Supported | | Version | Supported |
| ------- | ------------------ | | ------- | ------------------ |
| 1.11.x | :white_check_mark: | | 1.11.x | :white_check_mark: |
| 2.11.x | :white_check_mark: | | 2.14.x | :white_check_mark: |
## Supported PHP Versions ## Supported PHP Versions
@@ -18,6 +18,7 @@ This security policy only applies to the latest patches of the following PHP ver
| 7.3 | :white_check_mark: | | 7.3 | :white_check_mark: |
| 7.4 | :white_check_mark: | | 7.4 | :white_check_mark: |
| 8.0 | :white_check_mark: | | 8.0 | :white_check_mark: |
| 8.1 | :white_check_mark: |
## Reporting a Vulnerability ## Reporting a Vulnerability
+2 -2
View File
@@ -11,7 +11,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
operating-system: [ubuntu-20.04, ubuntu-18.04, windows-2019, macos-10.15] operating-system: [ubuntu-20.04, ubuntu-18.04, windows-2019, macos-10.15]
php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1'] php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
steps: steps:
- name: Setup PHP - name: Setup PHP
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
@@ -61,7 +61,7 @@ jobs:
git config --local user.name "${{ github.repository_owner }}" git config --local user.name "${{ github.repository_owner }}"
for os in ubuntu-20.04 ubuntu-18.04 windows-2019 macos-10.15 macos-11; do for os in ubuntu-20.04 ubuntu-18.04 windows-2019 macos-10.15 macos-11; do
echo "These are extensions which are loaded by default on the following PHP versions. More extensions which are available as packages and available on pecl are supported by setup-php. Refer to [php extension support](https://github.com/shivammathur/setup-php#heavy_plus_sign-php-extension-support) for more details." > Php-extensions-loaded-on-"$os".md echo "These are extensions which are loaded by default on the following PHP versions. More extensions which are available as packages and available on pecl are supported by setup-php. Refer to [php extension support](https://github.com/shivammathur/setup-php#heavy_plus_sign-php-extension-support) for more details." > Php-extensions-loaded-on-"$os".md
for version in 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1; do for version in 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2; do
if [ "$os" = "macos-11" ]; then if [ "$os" = "macos-11" ]; then
cat lists/php"$version"-macos-10.15.md >> Php-extensions-loaded-on-"$os".md cat lists/php"$version"-macos-10.15.md >> Php-extensions-loaded-on-"$os".md
else else
+1 -1
View File
@@ -25,7 +25,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
operating-system: [ubuntu-20.04, ubuntu-18.04, windows-latest, macos-latest] operating-system: [ubuntu-20.04, ubuntu-18.04, windows-latest, macos-latest]
php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1'] php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
env: env:
extensions: xml, opcache, xdebug, pcov extensions: xml, opcache, xdebug, pcov
key: cache-v3 key: cache-v3
+43 -35
View File
@@ -10,7 +10,7 @@
<a href="https://github.com/shivammathur/setup-php" title="GitHub action to setup PHP"><img alt="GitHub Actions status" src="https://github.com/shivammathur/setup-php/workflows/Main%20workflow/badge.svg"></a> <a href="https://github.com/shivammathur/setup-php" title="GitHub action to setup PHP"><img alt="GitHub Actions status" src="https://github.com/shivammathur/setup-php/workflows/Main%20workflow/badge.svg"></a>
<a href="https://codecov.io/gh/shivammathur/setup-php" title="Code coverage"><img alt="Codecov Code Coverage" src="https://img.shields.io/codecov/c/github/shivammathur/setup-php?logo=codecov"></a> <a href="https://codecov.io/gh/shivammathur/setup-php" title="Code coverage"><img alt="Codecov Code Coverage" src="https://img.shields.io/codecov/c/github/shivammathur/setup-php?logo=codecov"></a>
<a href="https://github.com/shivammathur/setup-php/blob/master/LICENSE" title="license"><img alt="LICENSE" src="https://img.shields.io/badge/license-MIT-428f7e.svg?logo=open%20source%20initiative&logoColor=white&labelColor=555555"></a> <a href="https://github.com/shivammathur/setup-php/blob/master/LICENSE" title="license"><img alt="LICENSE" src="https://img.shields.io/badge/license-MIT-428f7e.svg?logo=open%20source%20initiative&logoColor=white&labelColor=555555"></a>
<a href="#tada-php-support" title="PHP Versions Supported"><img alt="PHP Versions Supported" src="https://img.shields.io/badge/php-5.3%20to%208.1-777bb3.svg?logo=php&logoColor=white&labelColor=555555"></a> <a href="#tada-php-support" title="PHP Versions Supported"><img alt="PHP Versions Supported" src="https://img.shields.io/badge/php-5.3%20to%208.2-777bb3.svg?logo=php&logoColor=white&labelColor=555555"></a>
</p> </p>
<p align="center"> <p align="center">
<a href="https://reddit.com/r/setup_php" title="setup-php reddit"><img alt="setup-php reddit" src="https://img.shields.io/badge/reddit-join-FF5700?logo=reddit&logoColor=FF5700&labelColor=555555"></a> <a href="https://reddit.com/r/setup_php" title="setup-php reddit"><img alt="setup-php reddit" src="https://img.shields.io/badge/reddit-join-FF5700?logo=reddit&logoColor=FF5700&labelColor=555555"></a>
@@ -97,8 +97,8 @@ Both `GitHub-hosted` and `self-hosted` runners are suppported by `setup-php` on
On all supported OS/Platforms the following PHP versions are supported as per the runner. On all supported OS/Platforms the following PHP versions are supported as per the runner.
- PHP 5.3 to PHP 8.1 on GitHub-hosted runners. - PHP 5.3 to PHP 8.2 on GitHub-hosted runners.
- PHP 5.6 to PHP 8.1 on self-hosted runners. - PHP 5.6 to PHP 8.2 on self-hosted runners.
|PHP Version|Stability|Release Support|Runner Support| |PHP Version|Stability|Release Support|Runner Support|
|--- |--- |--- |--- | |--- |--- |--- |--- |
@@ -113,10 +113,11 @@ On all supported OS/Platforms the following PHP versions are supported as per th
|`7.4`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`| |`7.4`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`|
|`8.0`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`| |`8.0`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`|
|`8.1`|`Nightly`|`In development`|`GitHub-hosted`, `self-hosted`| |`8.1`|`Nightly`|`In development`|`GitHub-hosted`, `self-hosted`|
|`8.2`|`Nightly`|`In development`|`GitHub-hosted`, `self-hosted`|
**Notes:** **Notes:**
- Specifying `8.1` in `php-version` input installs a nightly build of `PHP 8.1.0-dev`. See [nightly build setup](#nightly-build-setup) for more information. - Specifying `8.1` and `8.2` in `php-version` input installs a nightly build of `PHP 8.1.0-dev` and `PHP 8.2.0-dev` respectively. See [nightly build setup](#nightly-build-setup) for more information.
- To use JIT on `PHP 8.0` and `PHP 8.1` refer to the [JIT configuration](#jit-configuration) section. - To use JIT on `PHP 8.0` and above, refer to the [JIT configuration](#jit-configuration) section.
## :heavy_plus_sign: PHP Extension Support ## :heavy_plus_sign: PHP Extension Support
@@ -160,16 +161,28 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string`
extensions: xdebug-beta extensions: xdebug-beta
``` ```
- Shared extensions can be removed by prefixing them with a `:`. - Shared extensions can be disabled by prefixing them with a `:`. All extensions depending on the specified extension will also be disabled.
```yaml ```yaml
- name: Setup PHP and remove shared extension - name: Setup PHP and disable opcache
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
with: with:
php-version: '8.0' php-version: '8.0'
extensions: :opcache extensions: :opcache
``` ```
- All shared extensions can be disabled by specifying `none`. When `none` is specified along with other extensions, it is hoisted to the start of the input. So, all the shared extensions will be disabled first, then rest of the extensions in the input will be processed.
**Note:** This disables all core and third-party shared extensions and thus, can break some tools which need them. So, make sure you add the required extensions after `none` in the `extensions` input.
```yaml
- name: Setup PHP without any shared extensions except mbstring
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
extensions: none, mbstring
```
- Extension `intl` can be set up with specific `ICU` version for `PHP 5.6` and above in `Ubuntu` workflows by suffixing `intl` with the `ICU` version. `ICU 50.2` and newer versions are supported. Refer to [`ICU builds`](https://github.com/shivammathur/icu-intl#icu4c-builds) for the specific versions supported. - Extension `intl` can be set up with specific `ICU` version for `PHP 5.6` and above in `Ubuntu` workflows by suffixing `intl` with the `ICU` version. `ICU 50.2` and newer versions are supported. Refer to [`ICU builds`](https://github.com/shivammathur/icu-intl#icu4c-builds) for the specific versions supported.
```yaml ```yaml
@@ -187,7 +200,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string`
- `geos` on `Ubuntu` and `macOS`. - `geos` on `Ubuntu` and `macOS`.
- `blackfire`, `couchbase`, `ioncube`, `oci8`, `pdo_firebird`, `pdo_oci`, `pecl_http`, `phalcon3` and `phalcon4` on all supported OS. - `blackfire`, `couchbase`, `ioncube`, `oci8`, `pdo_firebird`, `pdo_oci`, `pecl_http`, `phalcon3` and `phalcon4` on all supported OS.
- By default, extensions which cannot be added or removed gracefully leave an error message in the logs, the action is not interrupted. To change this behaviour you can set `fail-fast` flag to `true`. - By default, extensions which cannot be added or disabled gracefully leave an error message in the logs, the action is not interrupted. To change this behaviour you can set `fail-fast` flag to `true`.
```yaml ```yaml
- name: Setup PHP with fail-fast - name: Setup PHP with fail-fast
@@ -341,12 +354,12 @@ Runs on PHP 7.1 and newer PHP versions.
### Disable Coverage ### Disable Coverage
Specify `coverage: none` to remove both `Xdebug` and `PCOV`. Specify `coverage: none` to disable both `Xdebug` and `PCOV`.
Disable coverage for these reasons: Disable coverage for these reasons:
- You are not generating coverage reports while testing. - You are not generating coverage reports while testing.
- It will remove `Xdebug`, which will have a positive impact on PHP performance. - It will disable `Xdebug`, which will have a positive impact on PHP performance.
- You are using `phpdbg` for running your tests. - You are using `phpdbg` for running your tests.
- You are profiling your code using `blackfire`. - You are profiling your code using `blackfire`.
- You are using PHP in JIT mode. Please refer to [JIT configuration](#jit-configuration) section for more details. - You are using PHP in JIT mode. Please refer to [JIT configuration](#jit-configuration) section for more details.
@@ -370,14 +383,16 @@ Disable coverage for these reasons:
- Specify the PHP version you want to set up. - Specify the PHP version you want to set up.
- Accepts a `string`. For example `'8.0'`. - Accepts a `string`. For example `'8.0'`.
- Accepts `latest` to set up the latest stable PHP version. - Accepts `latest` to set up the latest stable PHP version.
- Accepts `nightly` to set up a nightly build from the master branch of PHP.
- Accepts the format `d.x`, where `d` is the major version. For example `5.x`, `7.x` and `8.x`. - Accepts the format `d.x`, where `d` is the major version. For example `5.x`, `7.x` and `8.x`.
- See [PHP support](#tada-php-support) for supported PHP versions. - See [PHP support](#tada-php-support) for supported PHP versions.
#### `extensions` (optional) #### `extensions` (optional)
- Specify the extensions you want to add or remove. - Specify the extensions you want to add or disable.
- Accepts a `string` in csv-format. For example `mbstring, :opcache`. - Accepts a `string` in csv-format. For example `mbstring, :opcache`.
- Non-default extensions prefixed with `:` are removed. - Accepts `none` to disable all shared extensions.
- Shared extensions prefixed with `:` are disabled.
- See [PHP extension support](#heavy_plus_sign-php-extension-support) for more info. - See [PHP extension support](#heavy_plus_sign-php-extension-support) for more info.
#### `ini-values` (optional) #### `ini-values` (optional)
@@ -388,7 +403,7 @@ Disable coverage for these reasons:
#### `coverage` (optional) #### `coverage` (optional)
- Specify the code coverage driver you want to set up. - Specify the code-coverage driver you want to set up.
- Accepts `xdebug`, `pcov` or `none`. - Accepts `xdebug`, `pcov` or `none`.
- See [coverage support](#signal_strength-coverage-support) for more info. - See [coverage support](#signal_strength-coverage-support) for more info.
@@ -490,7 +505,7 @@ jobs:
### Nightly Build Setup ### Nightly Build Setup
> Setup a nightly build of `PHP 8.1`. > Setup a nightly build of `PHP 8.1` or `PHP 8.2`.
- This version is currently in development. - This version is currently in development.
- Some user space extensions might not support this version currently. - Some user space extensions might not support this version currently.
@@ -651,10 +666,10 @@ act -P ubuntu-18.04=shivammathur/node:1804
### JIT Configuration ### JIT Configuration
> Enable Just-in-time(JIT) on PHP 8.0 and PHP 8.1. > Enable Just-in-time(JIT) on PHP 8.0 and above.
- To enable JIT, enable `opcache` in cli mode by setting `opcache.enable_cli=1`. - To enable JIT, enable `opcache` in cli mode by setting `opcache.enable_cli=1`.
- JIT conflicts with `Xdebug`, `PCOV`, and other extensions which override `zend_execute_ex` function, so set `coverage: none` and remove any such extension if added. - JIT conflicts with `Xdebug`, `PCOV`, and other extensions which override `zend_execute_ex` function, so set `coverage: none` and disable any such extension if added.
- By default, `opcache.jit=1235` and `opcache.jit_buffer_size=256M` are set which can be changed using `ini-values` input. - By default, `opcache.jit=1235` and `opcache.jit_buffer_size=256M` are set which can be changed using `ini-values` input.
- For detailed information about JIT related directives refer to the [`official PHP documentation`](https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.jit "opcache.jit documentation"). - For detailed information about JIT related directives refer to the [`official PHP documentation`](https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.jit "opcache.jit documentation").
@@ -871,31 +886,24 @@ Examples of using `setup-php` with various PHP Frameworks and Packages.
## :sparkling_heart: Support This Project ## :sparkling_heart: Support This Project
- This project is provided as Free and Open-Source software. We need funds to maintain and do future improvements. Please sponsor setup-php using the below options: - This project is provided as Free and Open-Source software. We need funds to maintain and do future improvements. Please sponsor setup-php using [GitHub sponsors](https://github.com/sponsors/shivammathur).
- [Open Collective](https://opencollective.com/setup-php "setup-php Open Collective")
- [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal")
- [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon")
- Please [reach out](mailto:contact@setup-php.com) if you have any questions about sponsoring setup-php. - Please [reach out](mailto:contact@setup-php.com) if you have any questions about sponsoring setup-php.
- Please star the project and share it. If you blog, please share your experience of using this action. - Please star the project and share it. If you blog, please share your experience of using this action.
*`setup-php` is generously supported by* ### Corporate Sponsors
<p> <p align="center">
<a href="https://www.jetbrains.com/?from=setup-php"> <a href="https://github.com/sponsors/shivammathur">
<img src="https://setup-php.com/sponsors/jetbrains.svg" alt="JetBrains" width="106" height="60"> <img src="https://setup-php.com/sponsors-corp/?" alt="Corporate sponsors of setup-php and related projects" width="100%">
</a> </a>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </p>
<a href="https://blackfire.io/?utm_source=setup-php">
<img src="https://setup-php.com/sponsors//blackfire.svg" alt="Blackfire" width="212" height="60"> ### Individual Sponsors
<p align="center">
<a href="https://github.com/sponsors/shivammathur">
<img src="https://setup-php.com/sponsors/?" alt="Individual sponsors of setup-php and related projects" width="100%">
</a> </a>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a href="https://www.macstadium.com/?source=setup-php">
<img src="https://setup-php.com/sponsors//macstadium.png" alt="Mac Stadium" width="148" height="60">
</a>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a href="https://tidelift.com/subscription/pkg/npm-setup-php">
<img src="https://setup-php.com/sponsors//tidelift.png" alt="Tidelift" width="70" height="60">
</a>
</p> </p>
## :package: Dependencies ## :package: Dependencies
+17 -48
View File
@@ -1,52 +1,21 @@
import * as config from '../src/config'; import * as config from '../src/config';
describe('Config tests', () => { describe('Config tests', () => {
it('checking addINIValuesOnWindows', async () => { it.each`
let win32: string = await config.addINIValues( ini_values | os_version | output
'post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata', ${'a=b, c=d'} | ${'win32'} | ${'Add-Content "$php_dir\\php.ini" "a=b\nc=d"'}
'win32' ${'a=b, c=d'} | ${'linux'} | ${'echo "a=b\nc=d" | sudo tee -a "${pecl_file:-${ini_file[@]}}"'}
); ${'a=b, c=d'} | ${'darwin'} | ${'echo "a=b\nc=d" | sudo tee -a "${pecl_file:-${ini_file[@]}}"'}
expect(win32).toContain( ${'a=b & ~c'} | ${'win32'} | ${'Add-Content "$php_dir\\php.ini" "a=\'b & ~c\'"'}
'Add-Content "$php_dir\\php.ini" "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata"' ${'a="~(b)"'} | ${'win32'} | ${'Add-Content "$php_dir\\php.ini" "a=\'~(b)\'"'}
); ${'a="b, c"'} | ${'win32'} | ${'Add-Content "$php_dir\\php.ini" "a=b, c"'}
${'a=b, c=d'} | ${'openbsd'} | ${'Platform openbsd is not supported'}
win32 = await config.addINIValues( `(
'post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata', 'checking addINIValues on $os_version',
'openbsd' async ({ini_values, os_version, output}) => {
); expect(await config.addINIValues(ini_values, os_version)).toContain(
expect(win32).toContain('Platform openbsd is not supported'); output
}); );
}
it('checking addINIValuesOnLinux', async () => { );
let linux: string = await config.addINIValues(
'post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata',
'linux',
true
);
expect(linux).toContain(
'echo "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata" | sudo tee -a "${pecl_file:-${ini_file[@]}}"'
);
linux = await config.addINIValues(
'post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata',
'openbsd'
);
expect(linux).toContain('Platform openbsd is not supported');
});
it('checking addINIValuesOnDarwin', async () => {
let darwin: string = await config.addINIValues(
'post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata',
'darwin'
);
expect(darwin).toContain(
'echo "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata" | sudo tee -a "${pecl_file:-${ini_file[@]}}"'
);
darwin = await config.addINIValues(
'post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata',
'openbsd'
);
expect(darwin).toContain('Platform openbsd is not supported');
});
}); });
+35 -106
View File
@@ -1,110 +1,39 @@
import * as coverage from '../src/coverage'; import * as coverage from '../src/coverage';
describe('Config tests', () => { describe('Config tests', () => {
it('checking addCoverage with PCOV on windows', async () => { it.each`
let win32: string = await coverage.addCoverage('PCOV', '7.4', 'win32'); driver | php | os | output
expect(win32).toContain('Add-Extension pcov'); ${'PCOV'} | ${'7.4'} | ${'win32'} | ${'Add-Extension pcov,Disable-Extension xdebug false'}
expect(win32).toContain('Remove-Extension xdebug'); ${'pcov'} | ${'7.0'} | ${'win32'} | ${'PHP 7.1 or newer is required'}
${'pcov'} | ${'5.6'} | ${'win32'} | ${'PHP 7.1 or newer is required'}
win32 = await coverage.addCoverage('pcov', '7.0', 'win32'); ${'pcov'} | ${'7.4'} | ${'win32'} | ${'Add-Extension pcov,Disable-Extension xdebug false'}
expect(win32).toContain('PHP 7.1 or newer is required'); ${'pcov'} | ${'7.4'} | ${'linux'} | ${'add_extension pcov,disable_extension xdebug false'}
${'pcov'} | ${'7.4'} | ${'darwin'} | ${'add_brew_extension pcov,disable_extension xdebug false'}
win32 = await coverage.addCoverage('pcov', '5.6', 'win32'); ${'xdebug'} | ${'7.4'} | ${'win32'} | ${'Add-Extension xdebug'}
expect(win32).toContain('PHP 7.1 or newer is required'); ${'xdebug3'} | ${'7.4'} | ${'win32'} | ${'Add-Extension xdebug'}
}); ${'xdebug2'} | ${'7.4'} | ${'win32'} | ${'Add-Extension xdebug stable 2.9.8'}
${'xdebug'} | ${'8.0'} | ${'linux'} | ${'add_extension xdebug'}
it('checking addCoverage with PCOV on linux', async () => { ${'xdebug3'} | ${'8.0'} | ${'linux'} | ${'add_extension xdebug'}
const linux: string = await coverage.addCoverage('pcov', '7.4', 'linux'); ${'xdebug2'} | ${'7.4'} | ${'linux'} | ${'add_pecl_extension xdebug 2.9.8 zend_extension'}
expect(linux).toContain('add_extension pcov'); ${'xdebug'} | ${'7.4'} | ${'darwin'} | ${'add_brew_extension xdebug'}
expect(linux).toContain('remove_extension xdebug'); ${'xdebug3'} | ${'7.4'} | ${'darwin'} | ${'add_brew_extension xdebug'}
}); ${'xdebug2'} | ${'7.4'} | ${'darwin'} | ${'add_brew_extension xdebug2'}
${'none'} | ${'7.4'} | ${'win32'} | ${'Disable-Extension xdebug false,Disable-Extension pcov false'}
it('checking addCoverage with PCOV on darwin', async () => { ${'none'} | ${'7.4'} | ${'linux'} | ${'disable_extension xdebug false,disable_extension pcov false'}
const darwin: string = await coverage.addCoverage('pcov', '7.4', 'darwin'); ${'none'} | ${'7.4'} | ${'darwin'} | ${'disable_extension xdebug false,disable_extension pcov false'}
expect(darwin).toContain('add_brew_extension pcov'); ${'nocov'} | ${'7.x'} | ${'any'} | ${''}
expect(darwin).toContain('remove_extension xdebug'); ${''} | ${'7.x'} | ${'any'} | ${''}
}); `(
'checking addCoverage with $driver on $os',
it('checking addCoverage with Xdebug on windows', async () => { async ({driver, php, os, output}) => {
const win32: string = await coverage.addCoverage('xdebug', '7.4', 'win32'); const script: string = await coverage.addCoverage(driver, php, os);
expect(win32).toContain('Add-Extension xdebug'); if (output) {
}); output.split(',').forEach((command: string) => {
expect(script).toContain(command);
it('checking addCoverage with Xdebug3 on windows', async () => { });
const win32: string = await coverage.addCoverage('xdebug3', '7.4', 'win32'); } else {
expect(win32).toContain('Add-Extension xdebug'); expect(script).toEqual(output);
}); }
}
it('checking addCoverage with Xdebug2 on windows', async () => { );
const win32: string = await coverage.addCoverage('xdebug2', '7.4', 'win32');
expect(win32).toContain('Add-Extension xdebug stable 2.9.8');
});
it('checking addCoverage with Xdebug on linux', async () => {
const linux: string = await coverage.addCoverage('xdebug', '8.0', 'linux');
expect(linux).toContain('add_extension xdebug');
});
it('checking addCoverage with Xdebug3 on linux', async () => {
const linux: string = await coverage.addCoverage('xdebug3', '8.0', 'linux');
expect(linux).toContain('add_extension xdebug');
});
it('checking addCoverage with Xdebug2 on linux', async () => {
const linux: string = await coverage.addCoverage('xdebug2', '7.4', 'linux');
expect(linux).toContain('add_pecl_extension xdebug 2.9.8 zend_extension');
});
it('checking addCoverage with Xdebug on darwin', async () => {
const darwin: string = await coverage.addCoverage(
'xdebug',
'7.4',
'darwin'
);
expect(darwin).toContain('add_brew_extension xdebug');
});
it('checking addCoverage with Xdebug3 on darwin', async () => {
const darwin: string = await coverage.addCoverage(
'xdebug3',
'7.4',
'darwin'
);
expect(darwin).toContain('add_brew_extension xdebug');
});
it('checking addCoverage with Xdebug2 on darwin', async () => {
const darwin: string = await coverage.addCoverage(
'xdebug2',
'7.4',
'darwin'
);
expect(darwin).toContain('add_brew_extension xdebug2');
});
it('checking disableCoverage windows', async () => {
const win32 = await coverage.addCoverage('none', '7.4', 'win32');
expect(win32).toContain('Remove-Extension xdebug');
expect(win32).toContain('Remove-Extension pcov');
});
it('checking disableCoverage on linux', async () => {
const linux: string = await coverage.addCoverage('none', '7.4', 'linux');
expect(linux).toContain('remove_extension xdebug');
expect(linux).toContain('remove_extension pcov');
});
it('checking disableCoverage on darwin', async () => {
const darwin: string = await coverage.addCoverage('none', '7.4', 'darwin');
expect(darwin).toContain('remove_extension xdebug');
expect(darwin).toContain('remove_extension pcov');
});
it('checking no or invalid coverage driver', async () => {
let nocov: string = await coverage.addCoverage('nocov', '7.x', 'any');
expect(nocov).toEqual('');
nocov = await coverage.addCoverage('', '7.x', 'any');
expect(nocov).toEqual('');
});
}); });
+12 -6
View File
@@ -3,14 +3,15 @@ import * as extensions from '../src/extensions';
describe('Extension tests', () => { describe('Extension tests', () => {
it('checking addExtensionOnWindows', async () => { it('checking addExtensionOnWindows', async () => {
let win32: string = await extensions.addExtension( let win32: string = await extensions.addExtension(
'Xdebug, pcov, sqlite, :intl, phalcon4, pecl_http, ioncube, oci8, pdo_oci, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2, sqlsrv-1.2.3preview1', 'none, Xdebug, pcov, sqlite, :intl, phalcon4, pecl_http, ioncube, oci8, pdo_oci, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2, sqlsrv-1.2.3preview1',
'7.4', '7.4',
'win32' 'win32'
); );
expect(win32).toContain('Disable-AllShared');
expect(win32).toContain('Add-Extension xdebug'); expect(win32).toContain('Add-Extension xdebug');
expect(win32).toContain('Add-Extension pcov'); expect(win32).toContain('Add-Extension pcov');
expect(win32).toContain('Add-Extension sqlite3'); expect(win32).toContain('Add-Extension sqlite3');
expect(win32).toContain('Remove-Extension intl'); expect(win32).toContain('Disable-Extension intl');
expect(win32).toContain('Add-Phalcon phalcon4'); expect(win32).toContain('Add-Phalcon phalcon4');
expect(win32).toContain('Add-Http'); expect(win32).toContain('Add-Http');
expect(win32).toContain('Add-Ioncube'); expect(win32).toContain('Add-Ioncube');
@@ -72,13 +73,14 @@ describe('Extension tests', () => {
it('checking addExtensionOnLinux', async () => { it('checking addExtensionOnLinux', async () => {
let linux: string = await extensions.addExtension( let linux: string = await extensions.addExtension(
'Xdebug, pcov, sqlite, :intl, ast, ast-beta, pdo_mysql, pdo-odbc, xdebug-alpha, grpc-1.2.3', 'none, Xdebug, pcov, sqlite, :intl, ast, ast-beta, pdo_mysql, pdo-odbc, xdebug-alpha, grpc-1.2.3',
'7.4', '7.4',
'linux' 'linux'
); );
expect(linux).toContain('disable_all_shared');
expect(linux).toContain('add_extension xdebug'); expect(linux).toContain('add_extension xdebug');
expect(linux).toContain('add_extension sqlite3'); expect(linux).toContain('add_extension sqlite3');
expect(linux).toContain('remove_extension intl'); expect(linux).toContain('disable_extension intl');
expect(linux).toContain('add_unstable_extension ast beta extension'); expect(linux).toContain('add_unstable_extension ast beta extension');
expect(linux).toContain('add_pdo_extension mysql'); expect(linux).toContain('add_pdo_extension mysql');
expect(linux).toContain('add_pdo_extension odbc'); expect(linux).toContain('add_pdo_extension odbc');
@@ -160,12 +162,14 @@ describe('Extension tests', () => {
it('checking addExtensionOnDarwin', async () => { it('checking addExtensionOnDarwin', async () => {
let darwin: string = await extensions.addExtension( let darwin: string = await extensions.addExtension(
'amqp, apcu, Xdebug, pcov, grpc, igbinary, imagick, imap, memcache, memcached, mongodb, msgpack, phalcon3, phalcon4, protobuf, psr, rdkafka, redis, swoole, yaml, sqlite, oci8, pdo_oci, :intl, ast-beta, grpc-1.2.3', 'none, amqp, apcu, expect, Xdebug, pcov, grpc, igbinary, imagick, imap, memcache, memcached, mongodb, msgpack, phalcon3, phalcon4, protobuf, psr, rdkafka, redis, ssh2, swoole, vips, yaml, sqlite, oci8, pdo_oci, :intl, ast-beta, grpc-1.2.3',
'7.2', '7.2',
'darwin' 'darwin'
); );
expect(darwin).toContain('disable_all_shared');
expect(darwin).toContain('add_brew_extension amqp extension'); expect(darwin).toContain('add_brew_extension amqp extension');
expect(darwin).toContain('add_brew_extension apcu extension'); expect(darwin).toContain('add_brew_extension apcu extension');
expect(darwin).toContain('add_brew_extension expect extension');
expect(darwin).toContain('add_brew_extension xdebug zend_extension'); expect(darwin).toContain('add_brew_extension xdebug zend_extension');
expect(darwin).toContain('add_brew_extension pcov extension'); expect(darwin).toContain('add_brew_extension pcov extension');
expect(darwin).toContain('add_brew_extension grpc extension'); expect(darwin).toContain('add_brew_extension grpc extension');
@@ -182,10 +186,12 @@ describe('Extension tests', () => {
expect(darwin).toContain('add_brew_extension psr extension'); expect(darwin).toContain('add_brew_extension psr extension');
expect(darwin).toContain('add_brew_extension rdkafka extension'); expect(darwin).toContain('add_brew_extension rdkafka extension');
expect(darwin).toContain('add_brew_extension redis extension'); expect(darwin).toContain('add_brew_extension redis extension');
expect(darwin).toContain('add_brew_extension ssh2 extension');
expect(darwin).toContain('add_brew_extension swoole extension'); expect(darwin).toContain('add_brew_extension swoole extension');
expect(darwin).toContain('add_brew_extension vips extension');
expect(darwin).toContain('add_brew_extension yaml extension'); expect(darwin).toContain('add_brew_extension yaml extension');
expect(darwin).toContain('add_extension sqlite3'); expect(darwin).toContain('add_extension sqlite3');
expect(darwin).toContain('remove_extension intl'); expect(darwin).toContain('disable_extension intl');
expect(darwin).toContain('add_unstable_extension ast beta extension'); expect(darwin).toContain('add_unstable_extension ast beta extension');
expect(darwin).toContain('add_pecl_extension grpc 1.2.3 extension'); expect(darwin).toContain('add_pecl_extension grpc 1.2.3 extension');
+4 -18
View File
@@ -17,25 +17,11 @@ jest.mock('../src/install', () => ({
const ini_values_csv: string = process.env['ini-values'] || ''; const ini_values_csv: string = process.env['ini-values'] || '';
const coverage_driver: string = process.env['coverage'] || ''; const coverage_driver: string = process.env['coverage'] || '';
let tools_csv: string = process.env['tools'] || ''; let tools_csv: string = process.env['tools'] || '';
const pecl: string = process.env['pecl'] || '';
if (pecl == 'true') {
tools_csv = 'pecl, ' + tools_csv;
}
let script = 'initial script ' + filename + version + os_version; let script = 'initial script ' + filename + version + os_version;
if (tools_csv) { script += tools_csv ? 'add_tool' : '';
script += 'add_tool'; script += extension_csv ? 'install extensions' : '';
} script += coverage_driver ? 'set coverage driver' : '';
if (extension_csv) { script += ini_values_csv ? 'edit php.ini' : '';
script += 'install extensions';
}
if (coverage_driver) {
script += 'set coverage driver';
}
if (ini_values_csv) {
script += 'edit php.ini';
}
return script; return script;
} }
), ),
+3 -6
View File
@@ -126,12 +126,9 @@ describe('Utils tests', () => {
}); });
it('checking extensionArray', async () => { it('checking extensionArray', async () => {
expect(await utils.extensionArray('a, b, php_c, php-d')).toEqual([ expect(
'a', await utils.extensionArray('a, :b, php_c, none, php-d, Zend e, :Zend f')
'b', ).toEqual(['none', 'a', ':b', 'c', 'd', 'e', ':f']);
'c',
'd'
]);
expect(await utils.extensionArray('')).toEqual([]); expect(await utils.extensionArray('')).toEqual([]);
expect(await utils.extensionArray(' ')).toEqual([]); expect(await utils.extensionArray(' ')).toEqual([]);
+39 -28
View File
@@ -111,7 +111,8 @@ const config = __importStar(__nccwpck_require__(88));
async function addCoverageXdebug(extension, version, os_version, pipe) { async function addCoverageXdebug(extension, version, os_version, pipe) {
let script = '\n'; let script = '\n';
script += script +=
(await extensions.addExtension(':pcov', version, os_version, true)) + pipe; (await extensions.addExtension(':pcov:false', version, os_version, true)) +
pipe;
script += script +=
(await extensions.addExtension(extension, version, os_version, true)) + (await extensions.addExtension(extension, version, os_version, true)) +
pipe; pipe;
@@ -124,8 +125,7 @@ async function addCoveragePCOV(version, os_version, pipe) {
switch (true) { switch (true) {
default: default:
script += script +=
(await extensions.addExtension(':xdebug', version, os_version, true)) + (await extensions.addExtension(':xdebug:false', version, os_version, true)) + pipe;
pipe;
script += script +=
(await extensions.addExtension('pcov', version, os_version, true)) + (await extensions.addExtension('pcov', version, os_version, true)) +
pipe; pipe;
@@ -143,10 +143,10 @@ exports.addCoveragePCOV = addCoveragePCOV;
async function disableCoverage(version, os_version, pipe) { async function disableCoverage(version, os_version, pipe) {
let script = '\n'; let script = '\n';
script += script +=
(await extensions.addExtension(':pcov', version, os_version, true)) + pipe; (await extensions.addExtension(':pcov:false', version, os_version, true)) +
script +=
(await extensions.addExtension(':xdebug', version, os_version, true)) +
pipe; pipe;
script +=
(await extensions.addExtension(':xdebug:false', version, os_version, true)) + pipe;
script += await utils.addLog('$tick', 'none', 'Disabled Xdebug and PCOV', os_version); script += await utils.addLog('$tick', 'none', 'Disabled Xdebug and PCOV', os_version);
return script; return script;
} }
@@ -210,7 +210,10 @@ async function addExtensionDarwin(extension_csv, version) {
const ext_prefix = await utils.getExtensionPrefix(ext_name); const ext_prefix = await utils.getExtensionPrefix(ext_name);
switch (true) { switch (true) {
case /^:/.test(ext_name): case /^:/.test(ext_name):
remove_script += '\nremove_extension ' + ext_name.slice(1); remove_script += '\ndisable_extension' + ext_name.replace(/:/g, ' ');
return;
case /^none$/.test(ext_name):
add_script += '\ndisable_all_shared';
return; return;
case /.+-.+\/.+@.+/.test(extension): case /.+-.+\/.+@.+/.test(extension):
add_script += await utils.parseExtensionSource(extension, ext_prefix); add_script += await utils.parseExtensionSource(extension, ext_prefix);
@@ -229,10 +232,11 @@ async function addExtensionDarwin(extension_csv, version) {
case /(5\.[3-6]|7\.0)pcov/.test(version_extension): case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
add_script += await utils.getUnsupportedLog('pcov', version, 'darwin'); add_script += await utils.getUnsupportedLog('pcov', version, 'darwin');
return; return;
case /(?<!5\.[3-5])(amqp|apcu|grpc|igbinary|imagick|imap|memcache|memcached|mongodb|msgpack|protobuf|psr|raphf|rdkafka|redis|swoole|xdebug|xdebug2|yaml|zmq)/.test(version_extension): case /(?<!5\.[3-5])(amqp|apcu|expect|grpc|igbinary|imagick|imap|memcache|memcached|mongodb|msgpack|protobuf|psr|raphf|rdkafka|redis|ssh2|swoole|xdebug|xdebug2|yaml|zmq)/.test(version_extension):
case /(5\.6|7\.[0-4])propro/.test(version_extension): case /(5\.6|7\.[0-4])propro/.test(version_extension):
case /(?<!5\.[3-6]|7\.0)pcov/.test(version_extension): case /(?<!5\.[3-6]|7\.0)pcov/.test(version_extension):
case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4/.test(version_extension): case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4/.test(version_extension):
case /(?<!5\.[3-6])vips/.test(version_extension):
add_script += await utils.joins('\nadd_brew_extension', ext_name, ext_prefix); add_script += await utils.joins('\nadd_brew_extension', ext_name, ext_prefix);
return; return;
case /^sqlite$/.test(extension): case /^sqlite$/.test(extension):
@@ -256,7 +260,10 @@ async function addExtensionWindows(extension_csv, version) {
let matches; let matches;
switch (true) { switch (true) {
case /^:/.test(ext_name): case /^:/.test(ext_name):
remove_script += '\nRemove-Extension ' + ext_name.slice(1); remove_script += '\nDisable-Extension' + ext_name.replace(/:/g, ' ');
break;
case /^none$/.test(ext_name):
add_script += '\nDisable-AllShared';
break; break;
case /^(5\.[3-6]|7\.[0-4]|8\.0)blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension): case /^(5\.[3-6]|7\.[0-4]|8\.0)blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
case /^pdo_oci$|^oci8$|^pdo_firebird$/.test(extension): case /^pdo_oci$|^oci8$|^pdo_firebird$/.test(extension):
@@ -313,7 +320,10 @@ async function addExtensionLinux(extension_csv, version) {
const ext_prefix = await utils.getExtensionPrefix(ext_name); const ext_prefix = await utils.getExtensionPrefix(ext_name);
switch (true) { switch (true) {
case /^:/.test(ext_name): case /^:/.test(ext_name):
remove_script += '\nremove_extension ' + ext_name.slice(1); remove_script += '\ndisable_extension' + ext_name.replace(/:/g, ' ');
return;
case /^none$/.test(ext_name):
add_script += '\ndisable_all_shared';
return; return;
case /.+-.+\/.+@.+/.test(extension): case /.+-.+\/.+@.+/.test(extension):
add_script += await utils.parseExtensionSource(extension, ext_prefix); add_script += await utils.parseExtensionSource(extension, ext_prefix);
@@ -414,8 +424,7 @@ const extensions = __importStar(__nccwpck_require__(390));
const tools = __importStar(__nccwpck_require__(740)); const tools = __importStar(__nccwpck_require__(740));
const utils = __importStar(__nccwpck_require__(918)); const utils = __importStar(__nccwpck_require__(918));
async function getScript(filename, version, os_version) { async function getScript(filename, version, os_version) {
const name = 'setup-php'; const url = 'https://setup-php.com/sponsor';
const url = 'https://setup-php.com/support';
process.env['fail_fast'] = await utils.getInput('fail-fast', false); process.env['fail_fast'] = await utils.getInput('fail-fast', false);
const extension_csv = await utils.getInput('extensions', false); const extension_csv = await utils.getInput('extensions', false);
const ini_values_csv = await utils.getInput('ini-values', false); const ini_values_csv = await utils.getInput('ini-values', false);
@@ -432,8 +441,8 @@ async function getScript(filename, version, os_version) {
if (ini_values_csv) { if (ini_values_csv) {
script += await config.addINIValues(ini_values_csv, os_version); script += await config.addINIValues(ini_values_csv, os_version);
} }
script += '\n' + (await utils.stepLog('Support this project', os_version)); script += '\n' + (await utils.stepLog(`Sponsor setup-php`, os_version));
script += '\n' + (await utils.addLog('$tick', name, url, os_version)); script += '\n' + (await utils.addLog('$tick', 'setup-php', url, os_version));
return await utils.writeScript(filename, script); return await utils.writeScript(filename, script);
} }
exports.getScript = getScript; exports.getScript = getScript;
@@ -449,7 +458,7 @@ async function run() {
const tool = await utils.scriptTool(os_version); const tool = await utils.scriptTool(os_version);
const script = os_version + (await utils.scriptExtension(os_version)); const script = os_version + (await utils.scriptExtension(os_version));
const location = await getScript(script, version, os_version); const location = await getScript(script, version, os_version);
await exec_1.exec(await utils.joins(tool, location, version, __dirname)); await (0, exec_1.exec)(await utils.joins(tool, location, version, __dirname));
} }
else { else {
core.setFailed('Unable to get the PHP version'); core.setFailed('Unable to get the PHP version');
@@ -955,7 +964,7 @@ exports.getManifestURL = getManifestURL;
async function parseVersion(version) { async function parseVersion(version) {
const manifest = await getManifestURL(); const manifest = await getManifestURL();
switch (true) { switch (true) {
case /^(latest|\d+\.x)$/.test(version): case /^(latest|nightly|\d+\.x)$/.test(version):
return JSON.parse((await fetch(manifest))['data'])[version]; return JSON.parse((await fetch(manifest))['data'])[version];
default: default:
switch (true) { switch (true) {
@@ -1041,18 +1050,20 @@ async function extensionArray(extension_csv) {
case ' ': case ' ':
return []; return [];
default: default:
return extension_csv return [
.split(',') extension_csv.match(/(^|,\s?)none(\s?,|$)/) ? 'none' : '',
.map(function (extension) { ...extension_csv
if (/.+-.+\/.+@.+/.test(extension)) { .split(',')
return extension; .map(function (extension) {
} if (/.+-.+\/.+@.+/.test(extension)) {
return extension return extension;
.trim() }
.toLowerCase() return extension
.replace(/^php[-_]/, ''); .trim()
}) .toLowerCase()
.filter(Boolean); .replace(/^(:)?(php[-_]|none|zend )/, '$1');
})
].filter(Boolean);
} }
} }
exports.extensionArray = extensionArray; exports.extensionArray = extensionArray;
+748 -708
View File
File diff suppressed because it is too large Load Diff
+27 -14
View File
@@ -1,14 +1,24 @@
{ {
"name": "setup-php", "name": "setup-php",
"version": "2.13.0", "version": "2.14.0",
"private": false, "private": false,
"description": "Setup PHP for use with GitHub Actions", "description": "Setup PHP for use with GitHub Actions",
"main": "lib/install.js", "main": "lib/install.js",
"types": "lib/install.d.ts",
"directories": {
"lib": "lib",
"test": "__tests__",
"src": "src"
},
"files": [
"lib",
"src"
],
"scripts": { "scripts": {
"build": "tsc", "build": "tsc",
"lint": "eslint **/*.ts --cache --fix", "lint": "eslint **/src/*.ts --cache --fix",
"format": "prettier --write **/*.ts && git add .", "format": "prettier --write **/src/*.ts && git add .",
"format-check": "prettier --check **/*.ts", "format-check": "prettier --check **/src/*.ts",
"release": "ncc build -o dist && git add -f dist/", "release": "ncc build -o dist && git add -f dist/",
"test": "jest" "test": "jest"
}, },
@@ -31,21 +41,24 @@
}, },
"devDependencies": { "devDependencies": {
"@types/jest": "^27.0.1", "@types/jest": "^27.0.1",
"@types/node": "^16.7.1", "@types/node": "^16.9.1",
"@typescript-eslint/eslint-plugin": "^4.29.2", "@typescript-eslint/eslint-plugin": "^4.31.0",
"@typescript-eslint/parser": "^4.29.2", "@typescript-eslint/parser": "^4.31.0",
"@vercel/ncc": "^0.29.2", "@vercel/ncc": "^0.31.0",
"eslint": "^7.32.0", "eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0", "eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.24.1", "eslint-plugin-import": "^2.24.2",
"eslint-plugin-jest": "^24.4.0", "eslint-plugin-jest": "^24.4.0",
"eslint-plugin-prettier": "^3.4.1", "eslint-plugin-prettier": "^4.0.0",
"husky": "^4.3.8", "husky": "^4.3.8",
"jest": "^27.0.6", "jest": "^27.1.1",
"jest-circus": "^27.0.6", "jest-circus": "^27.1.1",
"prettier": "^2.3.2", "prettier": "^2.4.0",
"ts-jest": "^27.0.5", "ts-jest": "^27.0.5",
"typescript": "^4.3.5" "typescript": "^4.4.3"
},
"bugs": {
"url": "https://github.com/shivammathur/setup-php/issues"
}, },
"husky": { "husky": {
"skipCI": true, "skipCI": true,
+1
View File
@@ -1,5 +1,6 @@
{ {
"latest": "8.0", "latest": "8.0",
"nightly": "8.2",
"5.x": "5.6", "5.x": "5.6",
"7.x": "7.4", "7.x": "7.4",
"8.x": "8.0" "8.x": "8.0"
+16 -6
View File
@@ -18,7 +18,8 @@ export async function addCoverageXdebug(
): Promise<string> { ): Promise<string> {
let script = '\n'; let script = '\n';
script += script +=
(await extensions.addExtension(':pcov', version, os_version, true)) + pipe; (await extensions.addExtension(':pcov:false', version, os_version, true)) +
pipe;
script += script +=
(await extensions.addExtension(extension, version, os_version, true)) + (await extensions.addExtension(extension, version, os_version, true)) +
pipe; pipe;
@@ -47,8 +48,12 @@ export async function addCoveragePCOV(
switch (true) { switch (true) {
default: default:
script += script +=
(await extensions.addExtension(':xdebug', version, os_version, true)) + (await extensions.addExtension(
pipe; ':xdebug:false',
version,
os_version,
true
)) + pipe;
script += script +=
(await extensions.addExtension('pcov', version, os_version, true)) + (await extensions.addExtension('pcov', version, os_version, true)) +
pipe; pipe;
@@ -92,10 +97,15 @@ export async function disableCoverage(
): Promise<string> { ): Promise<string> {
let script = '\n'; let script = '\n';
script += script +=
(await extensions.addExtension(':pcov', version, os_version, true)) + pipe; (await extensions.addExtension(':pcov:false', version, os_version, true)) +
script +=
(await extensions.addExtension(':xdebug', version, os_version, true)) +
pipe; pipe;
script +=
(await extensions.addExtension(
':xdebug:false',
version,
os_version,
true
)) + pipe;
script += await utils.addLog( script += await utils.addLog(
'$tick', '$tick',
'none', 'none',
+19 -5
View File
@@ -21,7 +21,11 @@ export async function addExtensionDarwin(
switch (true) { switch (true) {
// match :extension // match :extension
case /^:/.test(ext_name): case /^:/.test(ext_name):
remove_script += '\nremove_extension ' + ext_name.slice(1); remove_script += '\ndisable_extension' + ext_name.replace(/:/g, ' ');
return;
// Match none
case /^none$/.test(ext_name):
add_script += '\ndisable_all_shared';
return; return;
// match extensions for compiling from source // match extensions for compiling from source
case /.+-.+\/.+@.+/.test(extension): case /.+-.+\/.+@.+/.test(extension):
@@ -68,15 +72,17 @@ export async function addExtensionDarwin(
case /(5\.[3-6]|7\.0)pcov/.test(version_extension): case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
add_script += await utils.getUnsupportedLog('pcov', version, 'darwin'); add_script += await utils.getUnsupportedLog('pcov', version, 'darwin');
return; return;
// match 5.6 and newer - amqp, apcu, grpc, igbinary, imagick, imap, memcache, memcached, mongodb, msgpack, protobuf, raphf, rdkafka, redis, swoole, xdebug, xdebug2, yaml, zmq // match 5.6 and newer - amqp, apcu, expect, grpc, igbinary, imagick, imap, memcache, memcached, mongodb, msgpack, protobuf, raphf, rdkafka, redis, ssh2, swoole, xdebug, xdebug2, yaml, zmq
// match 7.1 and newer - pcov // match 7.1 and newer - pcov
// match 5.6 to 7.4 - propro // match 5.6 to 7.4 - propro
case /(?<!5\.[3-5])(amqp|apcu|grpc|igbinary|imagick|imap|memcache|memcached|mongodb|msgpack|protobuf|psr|raphf|rdkafka|redis|swoole|xdebug|xdebug2|yaml|zmq)/.test( // match 7.0 and newer - vips
case /(?<!5\.[3-5])(amqp|apcu|expect|grpc|igbinary|imagick|imap|memcache|memcached|mongodb|msgpack|protobuf|psr|raphf|rdkafka|redis|ssh2|swoole|xdebug|xdebug2|yaml|zmq)/.test(
version_extension version_extension
): ):
case /(5\.6|7\.[0-4])propro/.test(version_extension): case /(5\.6|7\.[0-4])propro/.test(version_extension):
case /(?<!5\.[3-6]|7\.0)pcov/.test(version_extension): case /(?<!5\.[3-6]|7\.0)pcov/.test(version_extension):
case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4/.test(version_extension): case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4/.test(version_extension):
case /(?<!5\.[3-6])vips/.test(version_extension):
add_script += await utils.joins( add_script += await utils.joins(
'\nadd_brew_extension', '\nadd_brew_extension',
ext_name, ext_name,
@@ -115,7 +121,11 @@ export async function addExtensionWindows(
switch (true) { switch (true) {
// Match :extension // Match :extension
case /^:/.test(ext_name): case /^:/.test(ext_name):
remove_script += '\nRemove-Extension ' + ext_name.slice(1); remove_script += '\nDisable-Extension' + ext_name.replace(/:/g, ' ');
break;
// Match none
case /^none$/.test(ext_name):
add_script += '\nDisable-AllShared';
break; break;
// match 5.3blackfire...8.0blackfire // match 5.3blackfire...8.0blackfire
// match 5.3blackfire-(semver)...8.0blackfire-(semver) // match 5.3blackfire-(semver)...8.0blackfire-(semver)
@@ -227,7 +237,11 @@ export async function addExtensionLinux(
switch (true) { switch (true) {
// Match :extension // Match :extension
case /^:/.test(ext_name): case /^:/.test(ext_name):
remove_script += '\nremove_extension ' + ext_name.slice(1); remove_script += '\ndisable_extension' + ext_name.replace(/:/g, ' ');
return;
// Match none
case /^none$/.test(ext_name):
add_script += '\ndisable_all_shared';
return; return;
// match extensions for compiling from source // match extensions for compiling from source
case /.+-.+\/.+@.+/.test(extension): case /.+-.+\/.+@.+/.test(extension):
+4 -7
View File
@@ -18,8 +18,7 @@ export async function getScript(
version: string, version: string,
os_version: string os_version: string
): Promise<string> { ): Promise<string> {
const name = 'setup-php'; const url = 'https://setup-php.com/sponsor';
const url = 'https://setup-php.com/support';
// taking inputs // taking inputs
process.env['fail_fast'] = await utils.getInput('fail-fast', false); process.env['fail_fast'] = await utils.getInput('fail-fast', false);
const extension_csv: string = await utils.getInput('extensions', false); const extension_csv: string = await utils.getInput('extensions', false);
@@ -29,7 +28,6 @@ export async function getScript(
let script: string = await utils.readFile(filename, 'src/scripts'); let script: string = await utils.readFile(filename, 'src/scripts');
script += await tools.addTools(tools_csv, version, os_version); script += await tools.addTools(tools_csv, version, os_version);
if (extension_csv) { if (extension_csv) {
script += await extensions.addExtension(extension_csv, version, os_version); script += await extensions.addExtension(extension_csv, version, os_version);
} }
@@ -39,9 +37,8 @@ export async function getScript(
if (ini_values_csv) { if (ini_values_csv) {
script += await config.addINIValues(ini_values_csv, os_version); script += await config.addINIValues(ini_values_csv, os_version);
} }
script += '\n' + (await utils.stepLog(`Sponsor setup-php`, os_version));
script += '\n' + (await utils.stepLog('Support this project', os_version)); script += '\n' + (await utils.addLog('$tick', 'setup-php', url, os_version));
script += '\n' + (await utils.addLog('$tick', name, url, os_version));
return await utils.writeScript(filename, script); return await utils.writeScript(filename, script);
} }
@@ -70,7 +67,7 @@ export async function run(): Promise<void> {
core.setFailed('Unable to get the PHP version'); core.setFailed('Unable to get the PHP version');
} }
} catch (error) { } catch (error) {
core.setFailed(error.message); core.setFailed((error as Error).message);
} }
} }
+65 -8
View File
@@ -102,6 +102,11 @@ check_extension() {
fi fi
} }
# Function to check if extension is shared
shared_extension() {
[ -e "${ext_dir:?}/$1.so" ]
}
# Function to enable cached extensions. # Function to enable cached extensions.
enable_cache_extension() { enable_cache_extension() {
deps=() deps=()
@@ -126,13 +131,65 @@ enable_cache_extension() {
enable_extension() { enable_extension() {
modules_dir="/var/lib/php/modules/$version" modules_dir="/var/lib/php/modules/$version"
[ -d "$modules_dir" ] && sudo find "$modules_dir" -path "*disabled*$1" -delete [ -d "$modules_dir" ] && sudo find "$modules_dir" -path "*disabled*$1" -delete
enable_extension_dependencies "$1" "$2"
if [ -d /tmp/extcache/"$1" ]; then if [ -d /tmp/extcache/"$1" ]; then
enable_cache_extension "$1" "$2" enable_cache_extension "$1" "$2"
elif ! check_extension "$1" && [ -e "${ext_dir:?}/$1.so" ]; then elif ! check_extension "$1" && shared_extension "$1"; then
echo "$2=${ext_dir:?}/$1.so" | sudo tee -a "${pecl_file:-${ini_file[@]}}" >/dev/null echo "$2=${ext_dir:?}/$1.so" | sudo tee -a "${pecl_file:-${ini_file[@]}}" >/dev/null
fi fi
} }
# Function to get a map of extensions and their dependent shared extensions.
get_extension_map() {
php -d'error_reporting=0' "${dist:?}"/../src/scripts/ext/extension_map.php
}
# Function to enable extension dependencies which are also extensions.
enable_extension_dependencies() {
extension=$1
prefix=$2
if ! [ -e /tmp/map.orig ]; then
get_extension_map | sudo tee /tmp/map.orig >/dev/null
fi
for dependency in $(grep "$extension:" /tmp/map.orig | cut -d ':' -f 2 | tr '\n' ' '); do
enable_extension "$dependency" "$prefix"
done
}
# Function to disable dependent extensions.
disable_extension_dependents() {
local extension=$1
for dependent in $(get_extension_map | grep -E ".*:.*\s$extension(\s|$)" | cut -d ':' -f 1 | tr '\n' ' '); do
disable_extension_helper "$dependent" true
add_log "${tick:?}" ":$extension" "Disabled $dependent as it depends on $extension"
done
}
# Function to disable an extension.
disable_extension() {
extension=$1
if check_extension "$extension"; then
if shared_extension "$extension"; then
disable_extension_helper "$extension" true
(! check_extension "$extension" && add_log "${tick:?}" ":$extension" "Disabled") ||
add_log "${cross:?}" ":$extension" "Could not disable $extension on PHP ${semver:?}"
else
add_log "${cross:?}" ":$extension" "Could not disable $extension on PHP $semver as it not a shared extension"
fi
elif shared_extension "$extension"; then
add_log "${tick:?}" ":$extension" "Disabled"
else
add_log "${tick:?}" ":$extension" "Could not find $extension on PHP $semver"
fi
}
# Function to disable shared extensions.
disable_all_shared() {
sudo sed -i.orig -E -e "/^(zend_)?extension\s*=/d" "${ini_file[@]}" "$pecl_file" 2>/dev/null || true
sudo find "${ini_dir:-$scan_dir}"/.. -name "*.ini" -not -path "*php.ini" -not -path "*mods-available*" -delete >/dev/null 2>&1 || true
add_log "${tick:?}" "none" "Disabled all shared extensions"
}
# Function to configure PHP # Function to configure PHP
configure_php() { configure_php() {
( (
@@ -186,8 +243,7 @@ add_pecl_extension() {
if [ "$ext_version" = "$pecl_version" ]; then if [ "$ext_version" = "$pecl_version" ]; then
add_log "${tick:?}" "$extension" "Enabled" add_log "${tick:?}" "$extension" "Enabled"
else else
disable_extension "$extension" >/dev/null 2>&1 disable_extension_helper "$extension" >/dev/null 2>&1
delete_extension "$extension" >/dev/null 2>&1
pecl_install "$extension-$pecl_version" pecl_install "$extension-$pecl_version"
add_extension_log "$extension-$pecl_version" "Installed and enabled" add_extension_log "$extension-$pecl_version" "Installed and enabled"
fi fi
@@ -301,14 +357,15 @@ add_composertool() {
# Function to get PHP version in semver format. # Function to get PHP version in semver format.
php_semver() { php_semver() {
php -v | grep -Eo -m 1 "[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z]+([0-9]+)?)?" | head -n 1 php -v | grep -Eo -m 1 "[0-9]+\.[0-9]+\.[0-9]+((-?[a-zA-Z]+([0-9]+)?)?){2}" | head -n 1
} }
# Function to get the tag for a php version. # Function to get the tag for a php version.
php_src_tag() { php_src_tag() {
php_src_tag='master' commit=$(php_extra_version | grep -Eo "[0-9a-zA-Z]+")
if ! [[ ${version:?} =~ $nightly_versions ]]; then if [[ -n "${commit}" ]]; then
php_src_tag="php-$semver" echo "$commit"
else
echo "php-$semver"
fi fi
echo "$php_src_tag"
} }
+14 -27
View File
@@ -7,29 +7,15 @@ self_hosted_helper() {
fi fi
} }
# Function to delete extension. # Helper function to disable an extension.
delete_extension() { disable_extension_helper() {
extension=$1 local extension=$1
sudo rm -rf "${scan_dir:?}"/*"$extension"* "${ext_dir:?}"/"$extension".so >/dev/null 2>&1 local disable_dependents=${2:-false}
} if [ "$disable_dependents" = "true" ]; then
disable_extension_dependents "$extension"
# Function to disable extension.
disable_extension() {
extension=$1
sudo sed -Ei '' "/=(.*\/)?\"?$extension(.so)?$/d" "${ini_file:?}"
}
# Function to remove extensions.
remove_extension() {
extension=$1
if check_extension "$extension"; then
disable_extension "$extension"
delete_extension "$extension"
(! check_extension "$extension" && add_log "${tick:?}" ":$extension" "Removed") ||
add_log "${cross:?}" ":$extension" "Could not remove $extension on PHP ${semver:?}"
else
add_log "${tick:?}" ":$extension" "Could not find $extension on PHP $semver"
fi fi
sudo sed -Ei '' "/=(.*\/)?\"?$extension(.so)?$/d" "${ini_file:?}"
sudo rm -rf "$scan_dir"/*"$extension"*
} }
# Function to fetch a brew tap. # Function to fetch a brew tap.
@@ -105,8 +91,8 @@ add_devtools() {
# Function to handle request to add PECL. # Function to handle request to add PECL.
add_pecl() { add_pecl() {
configure_pecl >/dev/null 2>&1 configure_pecl >/dev/null 2>&1
pecl_version=$(get_tool_version "pecl" "version") pear_version=$(get_tool_version "pecl" "version")
add_log "${tick:?}" "PECL" "Found PECL $pecl_version" add_log "${tick:?}" "PECL" "Found PECL $pear_version"
} }
# Function to link all libraries of a formula. # Function to link all libraries of a formula.
@@ -186,8 +172,9 @@ add_php() {
# Function to get extra version. # Function to get extra version.
php_extra_version() { php_extra_version() {
if [[ ${version:?} =~ ${nightly_versions:?} ]]; then php_formula_file="$tap_dir"/shivammathur/homebrew-php/Formula/php@"$version".rb
echo " ($(brew cat "$php_formula" | grep -Eo "commit=[0-9a-zA-Z]+" | cut -d'=' -f 2))" if [ -e "$php_formula_file" ] && ! grep -q "deprecate!" $php_formula_file && grep -Eq "archive/[0-9a-zA-Z]+" "$php_formula_file"; then
echo " ($(grep -Eo "archive/[0-9a-zA-Z]+" "$php_formula_file" | cut -d'/' -f 2))"
fi fi
} }
@@ -217,7 +204,7 @@ setup_php() {
semver=$(php_semver) semver=$(php_semver)
extra_version=$(php_extra_version) extra_version=$(php_extra_version)
if [ "${semver%.*}" != "$version" ]; then if [ "${semver%.*}" != "$version" ]; then
add_log "$cross" "PHP" "Could not setup PHP $version" add_log "${cross:?}" "PHP" "Could not setup PHP $version"
exit 1 exit 1
fi fi
+1 -1
View File
@@ -6,7 +6,7 @@ add_blackfire() {
platform=$(uname -s | tr '[:upper:]' '[:lower:]') platform=$(uname -s | tr '[:upper:]' '[:lower:]')
extension_version=$(echo "$extension" | cut -d '-' -f 2) extension_version=$(echo "$extension" | cut -d '-' -f 2)
blackfire_ini_file="${pecl_file:-${ini_file[@]}}" blackfire_ini_file="${pecl_file:-${ini_file[@]}}"
if [ ! -e "${ext_dir:?}/blackfire.so" ]; then if ! shared_extension blackfire; then
if [ "$extension_version" = "blackfire" ]; then if [ "$extension_version" = "blackfire" ]; then
if [[ ${version:?} =~ 5.[3-6] ]]; then if [[ ${version:?} =~ 5.[3-6] ]]; then
extension_version='1.50.0' extension_version='1.50.0'
+109
View File
@@ -0,0 +1,109 @@
<?php
/**
* Class for a map of extensions and their dependent extensions.
*
* Class ExtensionMap
*/
class ExtensionMap {
/** @var string Directory in which shared extensions are stored. */
private $extension_dir;
/** @var string File extension for PHP extension file. */
private $file_extension;
/** @var string Prefix in PHP extension file. */
private $file_prefix;
/** @var string String to store the map */
private $map;
/**
* ExtensionMap constructor.
*/
function __construct() {
$this->extension_dir = ini_get('extension_dir');
$this->file_extension = (PHP_OS == 'WINNT' ? '.dll' : '.so');
$this->file_prefix = (PHP_OS == 'WINNT' ? 'php_' : '');
$this->map = '';
}
/**
* Function to check if a shared extension file exists.
*
* @param string $extension
* @return bool
*/
public function checkSharedExtension($extension) {
$extension_file = $this->extension_dir. DIRECTORY_SEPARATOR . $this->file_prefix . $extension . $this->file_extension;
return file_exists($extension_file);
}
/**
* Function to get all shared extensions.
*
* @return string[]
*/
public function getSharedExtensions() {
$files = scandir($this->extension_dir);
$extensions = array_diff($files, array('.','..'));
$filter_pattern = "/$this->file_extension|$this->file_prefix/";
return array_map(function ($extension) use($filter_pattern) {
return preg_replace($filter_pattern, '', $extension);
}, $extensions);
}
/**
* Function to patch dependencies if there are any bugs in Reflection data.
*
* @param string $extension
* @param array $dependencies
* @return array
*/
public function patchDependencies($extension, $dependencies) {
// memcached 2.2.0 has no dependencies in reflection data.
if($extension == 'memcached') {
$dependencies = array_unique(array_merge($dependencies, array('igbinary', 'json', 'msgpack')));
}
return $dependencies;
}
/**
* Function to add extension to the map.
*
* @param string $extension
* @throws ReflectionException
*/
public function addExtensionToMap($extension) {
// PHP 5.3 does not allow using $this.
$self = $this;
$ref = new ReflectionExtension($extension);
$dependencies = array_keys(array_map('strtolower', $ref->getDependencies()));
$dependencies = $this->patchDependencies($extension, $dependencies);
$dependencies = array_filter($dependencies, function ($dependency) use ($self) {
return $self->checkSharedExtension($dependency);
});
$self->map .= $extension . ': ' . implode(' ', $dependencies) . PHP_EOL;
}
/**
* Function to print the map of shared extensions and their dependent extensions.
*
* @return string
*/
public function __toString() {
$extensions = array_map('strtolower', $this->getSharedExtensions());
foreach ($extensions as $extension) {
try {
$this->addExtensionToMap($extension);
} catch (ReflectionException $e) {
}
}
return $this->map;
}
}
$extension_map = new ExtensionMap();
echo $extension_map;
+1 -1
View File
@@ -31,7 +31,7 @@ Function Repair-ICU() {
} }
$zip_url = Get-ICUUrl $icu.Groups[1].Value $installed.Architecture $vs $zip_url = Get-ICUUrl $icu.Groups[1].Value $installed.Architecture $vs
if ($zip_url -ne '') { if ($zip_url -ne '') {
New-Item -Path "$php_dir" -Name "icu" -ItemType "directory" | Out-Null New-Item -Path "$php_dir" -Name "icu" -ItemType "directory" -Force > $null 2>&1
Invoke-WebRequest -Uri $zip_url -OutFile "$php_dir\icu\icu.zip" Invoke-WebRequest -Uri $zip_url -OutFile "$php_dir\icu\icu.zip"
Expand-Archive -Path $php_dir\icu\icu.zip -DestinationPath $php_dir\icu -Force Expand-Archive -Path $php_dir\icu\icu.zip -DestinationPath $php_dir\icu -Force
Get-ChildItem $php_dir\icu\bin -Filter *.dll | Copy-Item -Destination $php_dir -Force Get-ChildItem $php_dir\icu\bin -Filter *.dll | Copy-Item -Destination $php_dir -Force
+1 -1
View File
@@ -99,7 +99,7 @@ add_http_version() {
ext=$1 ext=$1
enable_http enable_http
if [ "x$(php -r "echo phpversion('http');")" != "x${ext##*-}" ]; then if [ "x$(php -r "echo phpversion('http');")" != "x${ext##*-}" ]; then
remove_extension http >/dev/null disable_extension_helper http >/dev/null
add_http_helper pecl_http-"${ext##*-}" "$os" add_http_helper pecl_http-"${ext##*-}" "$os"
status="Installed and enabled" status="Installed and enabled"
fi fi
+2 -2
View File
@@ -7,11 +7,11 @@ add_license_log() {
# Function to install ioncube. # Function to install ioncube.
add_ioncube() { add_ioncube() {
if [ ! -e "${ext_dir:?}/ioncube.so" ]; then if ! shared_extension ioncube; then
status='Installed and enabled' status='Installed and enabled'
os_name='lin' && [ "$(uname -s)" = "Darwin" ] && os_name='mac' os_name='lin' && [ "$(uname -s)" = "Darwin" ] && os_name='mac'
get -s -n "" https://downloads.ioncube.com/loader_downloads/ioncube_loaders_"$os_name"_x86-64.tar.gz | tar -xzf - -C /tmp get -s -n "" https://downloads.ioncube.com/loader_downloads/ioncube_loaders_"$os_name"_x86-64.tar.gz | tar -xzf - -C /tmp
sudo mv /tmp/ioncube/ioncube_loader_"$os_name"_"${version:?}".so "$ext_dir/ioncube.so" sudo mv /tmp/ioncube/ioncube_loader_"$os_name"_"${version:?}".so "${ext_dir:?}/ioncube.so"
fi fi
echo "zend_extension=$ext_dir/ioncube.so" | sudo tee "${scan_dir:?}/00-ioncube.ini" >/dev/null 2>&1 echo "zend_extension=$ext_dir/ioncube.so" | sudo tee "${scan_dir:?}/00-ioncube.ini" >/dev/null 2>&1
add_extension_log "ioncube" "$status" add_extension_log "ioncube" "$status"
+3 -1
View File
@@ -35,7 +35,7 @@ add_client() {
# Function to install oci8 and pdo_oci. # Function to install oci8 and pdo_oci.
add_oci_helper() { add_oci_helper() {
if ! [ -e "${ext_dir:?}/$ext.so" ]; then if ! shared_extension "$ext"; then
status='Installed and enabled' status='Installed and enabled'
read -r "${ext}_LINUX_LIBS" <<< "libaio-dev" read -r "${ext}_LINUX_LIBS" <<< "libaio-dev"
read -r "${ext}_CONFIGURE_OPTS" <<< "--with-php-config=$(command -v php-config) --with-${ext/_/-}=instantclient,$oracle_client" read -r "${ext}_CONFIGURE_OPTS" <<< "--with-php-config=$(command -v php-config) --with-${ext/_/-}=instantclient,$oracle_client"
@@ -43,6 +43,8 @@ add_oci_helper() {
patch_phpize patch_phpize
add_extension_from_source "$ext" https://github.com php php-src "$(php_src_tag)" extension get add_extension_from_source "$ext" https://github.com php php-src "$(php_src_tag)" extension get
restore_phpize restore_phpize
else
enable_extension "$ext" extension
fi fi
} }
+3 -3
View File
@@ -10,7 +10,7 @@ add_phalcon_helper() {
# Function to add phalcon3. # Function to add phalcon3.
add_phalcon3() { add_phalcon3() {
if [ -e "${ext_dir:?}/phalcon.so" ]; then if shared_extension phalcon; then
phalcon_version=$(php -d="extension=phalcon.so" -r "echo phpversion('phalcon');" | cut -d'.' -f 1) phalcon_version=$(php -d="extension=phalcon.so" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
if [ "$phalcon_version" != "$extension_major_version" ]; then if [ "$phalcon_version" != "$extension_major_version" ]; then
add_phalcon_helper add_phalcon_helper
@@ -24,10 +24,10 @@ add_phalcon3() {
# Function to add phalcon4. # Function to add phalcon4.
add_phalcon4() { add_phalcon4() {
if [ -e "${ext_dir:?}/psr.so" ] && ! php -m | grep -i -q -w psr; then if shared_extension phalcon && ! php -m | grep -i -q -w psr; then
echo "extension=psr.so" | sudo tee -a "${ini_file:?}" echo "extension=psr.so" | sudo tee -a "${ini_file:?}"
fi fi
if [ -e "$ext_dir/phalcon.so" ]; then if shared_extension phalcon; then
if php -m | grep -i -q -w psr; then if php -m | grep -i -q -w psr; then
phalcon_version=$(php -d="extension=phalcon" -r "echo phpversion('phalcon');" | cut -d'.' -f 1) phalcon_version=$(php -d="extension=phalcon" -r "echo phpversion('phalcon');" | cut -d'.' -f 1)
if [ "$phalcon_version" != "$extension_major_version" ]; then if [ "$phalcon_version" != "$extension_major_version" ]; then
+1 -1
View File
@@ -126,7 +126,7 @@ add_extension_from_source() {
step_log "Setup $slug" step_log "Setup $slug"
( (
add_devtools phpize >/dev/null 2>&1 add_devtools phpize >/dev/null 2>&1
delete_extension "$extension" disable_extension_helper "$extension"
fetch_extension "$fetch" fetch_extension "$fetch"
if ! [ "$(find . -maxdepth 1 -name '*.m4' -exec grep -H 'PHP_NEW_EXTENSION' {} \; | wc -l)" != "0" ]; then if ! [ "$(find . -maxdepth 1 -name '*.m4' -exec grep -H 'PHP_NEW_EXTENSION' {} \; | wc -l)" != "0" ]; then
add_log "${cross:?}" "$source" "$source does not have a PHP extension" add_log "${cross:?}" "$source" "$source does not have a PHP extension"
+13 -33
View File
@@ -19,35 +19,14 @@ install_packages() {
} }
# Function to disable an extension. # Function to disable an extension.
disable_extension() { disable_extension_helper() {
extension=$1 local extension=$1
sudo sed -Ei "/=(.*\/)?\"?$extension(.so)?$/d" "${ini_file[@]}" local disable_dependents=${2:-false}
sudo sed -Ei "/=(.*\/)?\"?$extension(.so)?$/d" "$pecl_file" if [ "$disable_dependents" = "true" ]; then
sudo find "$ini_dir"/.. -name "*$extension.ini" -delete >/dev/null 2>&1 || true disable_extension_dependents "$extension"
}
# Function to delete an extension.
delete_extension() {
extension=$1
disable_extension "$extension"
sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1
sudo sed -i "/Package: php$version-$extension/,/^$/d" /var/lib/dpkg/status
}
# Function to disable and delete extensions.
remove_extension() {
extension=$1
if check_extension "$extension"; then
if [[ ! "$version" =~ ${old_versions:?} ]] && [ -e /etc/php/"$version"/mods-available/"$extension".ini ]; then
sudo phpdismod -v "$version" "$extension" >/dev/null 2>&1
fi
delete_extension "$extension"
(! check_extension "$extension" && add_log "${tick:?}" ":$extension" "Removed") ||
add_log "${cross:?}" ":$extension" "Could not remove $extension on PHP ${semver:?}"
else
delete_extension "$extension"
add_log "${tick:?}" ":$extension" "Could not find $extension on PHP $semver"
fi fi
sudo sed -Ei "/=(.*\/)?\"?$extension(.so)?$/d" "${ini_file[@]}" "$pecl_file"
sudo find "$ini_dir"/.. -name "*$extension.ini" -not -path "*mods-available*" -delete >/dev/null 2>&1 || true
} }
# Function to add PDO extension. # Function to add PDO extension.
@@ -58,8 +37,8 @@ add_pdo_extension() {
else else
ext=$1 ext=$1
ext_name=$1 ext_name=$1
if [ -e "$ext_dir"/pdo.so ]; then if shared_extension pdo; then
disable_extension pdo disable_extension_helper pdo
echo "extension=pdo.so" | sudo tee "${ini_file[@]/php.ini/conf.d/10-pdo.ini}" >/dev/null 2>&1 echo "extension=pdo.so" | sudo tee "${ini_file[@]/php.ini/conf.d/10-pdo.ini}" >/dev/null 2>&1
fi fi
if [ "$ext" = "mysql" ]; then if [ "$ext" = "mysql" ]; then
@@ -126,8 +105,8 @@ add_pecl() {
install_packages php-pear install_packages php-pear
fi fi
configure_pecl >/dev/null 2>&1 configure_pecl >/dev/null 2>&1
pecl_version=$(get_tool_version "pecl" "version") pear_version=$(get_tool_version "pecl" "version")
add_log "${tick:?}" "PECL" "Added PECL $pecl_version" add_log "${tick:?}" "PECL" "Added PECL $pear_version"
} }
# Function to switch versions of PHP binaries. # Function to switch versions of PHP binaries.
@@ -189,7 +168,7 @@ link_pecl_file() {
# Function to get extra version. # Function to get extra version.
php_extra_version() { php_extra_version() {
if [[ ${version:?} =~ ${nightly_versions:?} ]]; then if [ -e /etc/php/"$version"/COMMIT ]; then
echo " ($(cat "/etc/php/$version/COMMIT"))" echo " ($(cat "/etc/php/$version/COMMIT"))"
fi fi
} }
@@ -228,6 +207,7 @@ setup_php() {
scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||") scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
ini_dir=$(php --ini | grep "(php.ini)" | sed -e "s|.*: s*||") ini_dir=$(php --ini | grep "(php.ini)" | sed -e "s|.*: s*||")
pecl_file="$scan_dir"/99-pecl.ini pecl_file="$scan_dir"/99-pecl.ini
export ext_dir
mapfile -t ini_file < <(sudo find "$ini_dir/.." -name "php.ini" -exec readlink -m {} +) mapfile -t ini_file < <(sudo find "$ini_dir/.." -name "php.ini" -exec readlink -m {} +)
link_pecl_file link_pecl_file
configure_php configure_php
+25 -7
View File
@@ -96,6 +96,21 @@ add_key() {
fi fi
} }
# Function to check if a PPA and its lists exist
check_lists() {
ppa=$1
ppa_search=$2
if grep -Eqr "$ppa_search" "$list_dir"; then
list_count="$(find /var/lib/apt/lists -name "*${ppa/\//_}*" | wc -l)"
if [ "$list_count" = "0" ]; then
update_lists "$ppa" "$ppa_search"
fi
return 0;
else
return 1;
fi
}
# Function to add a sources list. # Function to add a sources list.
add_list() { add_list() {
ppa=${1-ondrej/php} ppa=${1-ondrej/php}
@@ -104,13 +119,16 @@ add_list() {
package_dist=${4:-"$VERSION_CODENAME"} package_dist=${4:-"$VERSION_CODENAME"}
branches=${5:-main} branches=${5:-main}
ppa_search="deb .*$ppa_url $package_dist .*$branches" ppa_search="deb .*$ppa_url $package_dist .*$branches"
grep -Eqr "$ppa_search" "$list_dir" && echo "Repository $ppa already exists" && return; if check_lists "$ppa" "$ppa_search"; then
arch=$(dpkg --print-architecture) echo "Repository $ppa already exists";
[ -e "$key_source" ] && key_file=$key_source || key_file="$key_dir"/"${ppa/\//-}"-keyring.gpg else
add_key "$ppa" "$ppa_url" "$package_dist" "$key_source" "$key_file" arch=$(dpkg --print-architecture)
echo "deb [arch=$arch signed-by=$key_file] $ppa_url $package_dist $branches" | sudo tee -a "$list_dir"/"${ppa/\//-}".list >/dev/null 2>&1 [ -e "$key_source" ] && key_file=$key_source || key_file="$key_dir"/"${ppa/\//-}"-keyring.gpg
update_lists "$ppa" "$ppa_search" add_key "$ppa" "$ppa_url" "$package_dist" "$key_source" "$key_file"
. /etc/os-release echo "deb [arch=$arch signed-by=$key_file] $ppa_url $package_dist $branches" | sudo tee -a "$list_dir"/"${ppa/\//-}".list >/dev/null 2>&1
update_lists "$ppa" "$ppa_search"
. /etc/os-release
fi
} }
# Function to remove a PPA. # Function to remove a PPA.
+94 -18
View File
@@ -74,20 +74,20 @@ Function Add-Path {
Function Add-Printf { Function Add-Printf {
if (-not(Test-Path "C:\Program Files\Git\usr\bin\printf.exe")) { if (-not(Test-Path "C:\Program Files\Git\usr\bin\printf.exe")) {
if(Test-Path "C:\msys64\usr\bin\printf.exe") { if(Test-Path "C:\msys64\usr\bin\printf.exe") {
New-Item -Path $bin_dir\printf.exe -ItemType SymbolicLink -Value C:\msys64\usr\bin\printf.exe New-Item -Path $bin_dir\printf.exe -ItemType SymbolicLink -Value C:\msys64\usr\bin\printf.exe -Force > $null 2>&1
} else { } else {
Invoke-WebRequest -Uri "$github/shivammathur/printf/releases/latest/download/printf-x64.zip" -OutFile "$bin_dir\printf.zip" Invoke-WebRequest -Uri "$github/shivammathur/printf/releases/latest/download/printf-x64.zip" -OutFile "$bin_dir\printf.zip"
Expand-Archive -Path $bin_dir\printf.zip -DestinationPath $bin_dir -Force Expand-Archive -Path $bin_dir\printf.zip -DestinationPath $bin_dir -Force
} }
} else { } else {
New-Item -Path $bin_dir\printf.exe -ItemType SymbolicLink -Value "C:\Program Files\Git\usr\bin\printf.exe" New-Item -Path $bin_dir\printf.exe -ItemType SymbolicLink -Value "C:\Program Files\Git\usr\bin\printf.exe" -Force > $null 2>&1
} }
} }
# Function to get a clean Powershell profile. # Function to get a clean Powershell profile.
Function Get-CleanPSProfile { Function Get-CleanPSProfile {
if(-not(Test-Path -LiteralPath $profile)) { if(-not(Test-Path -LiteralPath $profile)) {
New-Item -Path $profile -ItemType "file" -Force New-Item -Path $profile -ItemType "file" -Force > $null 2>&1
} }
Set-Content $current_profile -Value '' Set-Content $current_profile -Value ''
Add-ToProfile $profile $current_profile.replace('\', '\\') ". $current_profile" Add-ToProfile $profile $current_profile.replace('\', '\\') ". $current_profile"
@@ -154,7 +154,7 @@ Function Get-ExtensionPrerequisites{
) )
$deps_dir = "$ext_dir\$extension-vc$($installed.VCVersion)-$arch" $deps_dir = "$ext_dir\$extension-vc$($installed.VCVersion)-$arch"
$extensions_with_dependencies = ('imagick') $extensions_with_dependencies = ('imagick')
New-Item $deps_dir -Type Directory 2>&1 | Out-Null New-Item $deps_dir -Type Directory -Force > $null 2>&1
if($extensions_with_dependencies.Contains($extension)) { if($extensions_with_dependencies.Contains($extension)) {
Install-PhpExtensionPrerequisite -Extension $extension -InstallPath $deps_dir -PhpPath $php_dir Install-PhpExtensionPrerequisite -Extension $extension -InstallPath $deps_dir -PhpPath $php_dir
} }
@@ -192,6 +192,7 @@ Function Add-Extension {
} }
default { default {
$deps_dir = Get-ExtensionPrerequisites $extension $deps_dir = Get-ExtensionPrerequisites $extension
Enable-ExtensionDependencies $extension
Enable-PhpExtension -Extension $extension_info.Handle -Path $php_dir Enable-PhpExtension -Extension $extension_info.Handle -Path $php_dir
Set-ExtensionPrerequisites $deps_dir Set-ExtensionPrerequisites $deps_dir
Add-Log $tick $extension "Enabled" Add-Log $tick $extension "Enabled"
@@ -214,8 +215,13 @@ Function Add-Extension {
} }
} }
# Function to remove PHP extensions. # Function to get a map of extensions and their dependent shared extensions.
Function Remove-Extension() { Function Get-ExtensionMap {
php -d'error_reporting=0' $dist\..\src\scripts\ext\extension_map.php
}
# Function to enable extension dependencies which are also extensions.
Function Enable-ExtensionDependencies {
Param ( Param (
[Parameter(Position = 0, Mandatory = $true)] [Parameter(Position = 0, Mandatory = $true)]
[ValidateNotNull()] [ValidateNotNull()]
@@ -223,21 +229,90 @@ Function Remove-Extension() {
[string] [string]
$extension $extension
) )
if(php -m | findstr -i $extension) { if (-not(Test-Path $env:TEMP\map.orig)) {
try { Get-ExtensionMap | Set-Content -Path $env:TEMP\map.orig
Disable-PhpExtension $extension $php_dir }
if (Test-Path $ext_dir\php_$extension.dll) { $entry = findstr /r "$extension`:.*" $env:TEMP\map.orig
Remove-Item $ext_dir\php_$extension.dll if($entry) {
$entry.split(':')[1].trim().split(' ') | ForEach-Object {
if (-not(php -m | findstr -i $_)) {
Enable-PhpExtension -Extension $_ -Path $php_dir
} }
Add-Log $tick ":$extension" "Removed"
} catch {
Add-Log $cross ":$extension" "Could not remove $extension on PHP $($installed.FullVersion)"
} }
}
}
# Function to disable dependent extensions.
Function Disable-DependentExtensions() {
Param (
[Parameter(Position = 0, Mandatory = $true)]
[ValidateNotNull()]
[ValidateLength(1, [int]::MaxValue)]
[string]
$extension
)
Get-ExtensionMap | Select-String -Pattern ".*:.*\s$extension(\s|$)" | ForEach-Object {
$dependent = $_.Matches[0].Value.split(':')[0];
Disable-ExtensionHelper -Extension $dependent -DisableDependents
Add-Log $tick ":$extension" "Disabled $dependent as it depends on $extension"
}
}
# Helper function to disable an extension.
Function Disable-ExtensionHelper() {
Param (
[Parameter(Position = 0, Mandatory = $true)]
[ValidateNotNull()]
[ValidateLength(1, [int]::MaxValue)]
[string]
$extension,
[switch] $DisableDependents
)
if($DisableDependents) {
Disable-DependentExtensions $extension
}
Disable-PhpExtension -Extension $extension -Path $php_dir
}
# Function to disable an extension.
Function Disable-Extension() {
Param (
[Parameter(Position = 0, Mandatory = $true)]
[ValidateNotNull()]
[ValidateLength(1, [int]::MaxValue)]
[string]
$extension,
[Parameter(Position = 1, Mandatory = $false)]
[ValidateNotNull()]
[ValidateLength(1, [int]::MaxValue)]
[string]
$DisableDependents
)
if(php -m | findstr -i $extension) {
if(Test-Path $ext_dir\php_$extension.dll) {
try {
$params = @{ Extension = $extension; DisableDependents = ($DisableDependents -ne 'false') }
Disable-ExtensionHelper @params
Add-Log $tick ":$extension" "Disabled"
} catch {
Add-Log $cross ":$extension" "Could not disable $extension on PHP $($installed.FullVersion)"
}
} else {
Add-Log $cross ":$extension" "Could not disable $extension on PHP $($installed.FullVersion) as it not a shared extension"
}
} elseif(Test-Path $ext_dir\php_$extension.dll) {
Add-Log $tick ":$extension" "Disabled"
} else { } else {
Add-Log $tick ":$extension" "Could not find $extension on PHP $($installed.FullVersion)" Add-Log $tick ":$extension" "Could not find $extension on PHP $($installed.FullVersion)"
} }
} }
# Function to disable shared extensions.
Function Disable-AllShared() {
(Get-Content $php_dir\php.ini) | Where-Object {$_ -notmatch '^(zend_)?extension\s*='} | Set-Content $php_dir\php.ini
Add-Log $tick "none" "Disabled all shared extensions"
}
# Function to configure composer. # Function to configure composer.
Function Edit-ComposerConfig() { Function Edit-ComposerConfig() {
Param( Param(
@@ -414,7 +489,7 @@ if($env:RUNNER -eq 'self-hosted') {
$ext_dir = "$php_dir\ext" $ext_dir = "$php_dir\ext"
$cert_source='Curl' $cert_source='Curl'
Get-CleanPSProfile >$null 2>&1 Get-CleanPSProfile >$null 2>&1
New-Item $bin_dir -Type Directory 2>&1 | Out-Null New-Item $bin_dir -Type Directory -Force > $null 2>&1
Add-Path -PathItem $bin_dir Add-Path -PathItem $bin_dir
if($version -lt 5.6) { if($version -lt 5.6) {
Add-Log $cross "PHP" "PHP $version is not supported on self-hosted runner" Add-Log $cross "PHP" "PHP $version is not supported on self-hosted runner"
@@ -424,7 +499,7 @@ if($env:RUNNER -eq 'self-hosted') {
if ((Get-InstalledModule).Name -notcontains 'VcRedist') { if ((Get-InstalledModule).Name -notcontains 'VcRedist') {
Install-Module -Name VcRedist -Force Install-Module -Name VcRedist -Force
} }
New-Item $php_dir -Type Directory 2>&1 | Out-Null New-Item $php_dir -Type Directory -Force > $null 2>&1
Add-Path -PathItem $php_dir Add-Path -PathItem $php_dir
setx PHPROOT $php_dir >$null 2>&1 setx PHPROOT $php_dir >$null 2>&1
} else { } else {
@@ -457,13 +532,14 @@ if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version
try { try {
if ($version -match $nightly_versions) { if ($version -match $nightly_versions) {
Invoke-WebRequest -UseBasicParsing -Uri $php_builder/releases/latest/download/Get-PhpNightly.ps1 -OutFile $php_dir\Get-PhpNightly.ps1 > $null 2>&1 Invoke-WebRequest -UseBasicParsing -Uri $php_builder/releases/latest/download/Get-PhpNightly.ps1 -OutFile $php_dir\Get-PhpNightly.ps1 > $null 2>&1
& $php_dir\Get-PhpNightly.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir > $null 2>&1 & $php_dir\Get-PhpNightly.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir -Version $version > $null 2>&1
$extra_version = " ($(Get-Content $php_dir\COMMIT))" $extra_version = " ($(Get-Content $php_dir\COMMIT))"
} else { } else {
Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force > $null 2>&1 Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force > $null 2>&1
} }
} catch { } } catch { }
} else { } else {
Set-PhpIniKey -Key 'extension_dir' -Value $ext_dir -Path $php_dir
if($version -match $jit_versions) { if($version -match $jit_versions) {
('opcache.enable=1', 'opcache.jit_buffer_size=256M', 'opcache.jit=1235') | ForEach-Object { $p=$_.split('='); Set-PhpIniKey -Key $p[0] -Value $p[1] -Path $php_dir } ('opcache.enable=1', 'opcache.jit_buffer_size=256M', 'opcache.jit=1235') | ForEach-Object { $p=$_.split('='); Set-PhpIniKey -Key $p[0] -Value $p[1] -Path $php_dir }
} }
@@ -489,6 +565,6 @@ if($version -lt "5.5") {
Enable-PhpExtension -Extension $enable_extensions -Path $php_dir Enable-PhpExtension -Extension $enable_extensions -Path $php_dir
Update-PhpCAInfo -Path $php_dir -Source $cert_source Update-PhpCAInfo -Path $php_dir -Source $cert_source
Copy-Item -Path $dist\..\src\configs\*.json -Destination $env:RUNNER_TOOL_CACHE Copy-Item -Path $dist\..\src\configs\*.json -Destination $env:RUNNER_TOOL_CACHE
New-Item -ItemType Directory -Path $composer_bin -Force 2>&1 | Out-Null New-Item -ItemType Directory -Path $composer_bin -Force > $null 2>&1
Write-Output "::set-output name=php-version::$($installed.FullVersion)" Write-Output "::set-output name=php-version::$($installed.FullVersion)"
Add-Log $tick "PHP" "$status PHP $($installed.FullVersion)$extra_version" Add-Log $tick "PHP" "$status PHP $($installed.FullVersion)$extra_version"
+16 -13
View File
@@ -102,7 +102,7 @@ export async function getManifestURL(): Promise<string> {
export async function parseVersion(version: string): Promise<string> { export async function parseVersion(version: string): Promise<string> {
const manifest = await getManifestURL(); const manifest = await getManifestURL();
switch (true) { switch (true) {
case /^(latest|\d+\.x)$/.test(version): case /^(latest|nightly|\d+\.x)$/.test(version):
return JSON.parse((await fetch(manifest))['data'])[version]; return JSON.parse((await fetch(manifest))['data'])[version];
default: default:
switch (true) { switch (true) {
@@ -280,18 +280,21 @@ export async function extensionArray(
case ' ': case ' ':
return []; return [];
default: default:
return extension_csv return [
.split(',') extension_csv.match(/(^|,\s?)none(\s?,|$)/) ? 'none' : '',
.map(function (extension: string) { ...extension_csv
if (/.+-.+\/.+@.+/.test(extension)) { .split(',')
return extension;
} .map(function (extension: string) {
return extension if (/.+-.+\/.+@.+/.test(extension)) {
.trim() return extension;
.toLowerCase() }
.replace(/^php[-_]/, ''); return extension
}) .trim()
.filter(Boolean); .toLowerCase()
.replace(/^(:)?(php[-_]|none|zend )/, '$1');
})
].filter(Boolean);
} }
} }
+1
View File
@@ -1,5 +1,6 @@
{ {
"compilerOptions": { "compilerOptions": {
"declaration": true,
"esModuleInterop": true, "esModuleInterop": true,
"lib": [ "lib": [
"ES2020" "ES2020"