From e698b6a0aa749be7c6b0881b8ce3478608fd8aec Mon Sep 17 00:00:00 2001 From: Philipp Bammes Date: Wed, 20 Jul 2022 09:21:08 +0200 Subject: [PATCH] chore: fix typo in "set up" --- .github/workflows/docs.yml | 2 +- .github/workflows/node.yml | 2 +- .github/workflows/php.yml | 6 ++-- .github/workflows/publish.yml | 2 +- README.md | 54 ++++++++++++++++---------------- __tests__/tools.test.ts | 2 +- action.yml | 12 +++---- dist/index.js | 24 +++++++------- examples/bedrock.yml | 2 +- examples/blackfire-player.yml | 4 +-- examples/blackfire.yml | 4 +-- examples/cakephp-mysql.yml | 6 ++-- examples/cakephp-postgres.yml | 6 ++-- examples/cakephp.yml | 6 ++-- examples/codeigniter.yml | 2 +- examples/laminas-mvc.yml | 2 +- examples/laravel-mysql.yml | 2 +- examples/laravel-postgres.yml | 2 +- examples/laravel.yml | 2 +- examples/lumen-mysql.yml | 2 +- examples/lumen-postgres.yml | 2 +- examples/lumen.yml | 2 +- examples/phalcon-mysql.yml | 2 +- examples/phalcon-postgres.yml | 4 +-- examples/sage.yml | 4 +-- examples/slim-framework.yml | 2 +- examples/symfony-mysql.yml | 2 +- examples/symfony-postgres.yml | 2 +- examples/symfony.yml | 2 +- examples/yii2-mysql.yml | 2 +- examples/yii2-postgres.yml | 2 +- package.json | 2 +- src/coverage.ts | 2 +- src/extensions.ts | 2 +- src/scripts/darwin.sh | 6 ++-- src/scripts/extensions/source.sh | 2 +- src/scripts/linux.sh | 4 +-- src/scripts/win32.ps1 | 4 +-- src/tools.ts | 4 +-- 39 files changed, 98 insertions(+), 98 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 11f7a47d..6e66f53e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -18,7 +18,7 @@ jobs: operating-system: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, windows-2022, macos-11] 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: - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml index 9125f507..0e6da85b 100644 --- a/.github/workflows/node.yml +++ b/.github/workflows/node.yml @@ -33,7 +33,7 @@ jobs: with: fetch-depth: 2 - - name: Setup Node.js 16.x + - name: Set up Node.js 16.x uses: actions/setup-node@v3 with: node-version: 16.x diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 654379c2..f2a0874f 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -36,7 +36,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Setup cache environment + - name: Set up cache environment id: cache-env uses: shivammathur/cache-extensions@develop with: @@ -51,7 +51,7 @@ jobs: key: ${{ steps.cache-env.outputs.key }} restore-keys: ${{ steps.cache-env.outputs.key }} - - name: Setup PHP with extensions and custom config + - name: Set up PHP with extensions and custom config run: node dist/index.js env: php-version: ${{ matrix.php-versions }} @@ -79,4 +79,4 @@ jobs: php -r "if(ini_get('memory_limit')!='-1') {throw new Exception('memory_limit not disabled');}" php -r "if(ini_get('post_max_size')!='256M') {throw new Exception('post_max_size not added');}" php -r "if(ini_get('short_open_tag')!=1) {throw new Exception('short_open_tag not added');}" - php -r "if(ini_get('date.timezone')!='Asia/Kolkata') {throw new Exception('date.timezone not added');}" \ No newline at end of file + php -r "if(ini_get('date.timezone')!='Asia/Kolkata') {throw new Exception('date.timezone not added');}" diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ecf18b72..1c1655da 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -27,7 +27,7 @@ jobs: with: ref: ${{ github.event.inputs.tag }} - - name: Setup Node.js + - name: Set up Node.js uses: actions/setup-node@v3 with: node-version: '16.x' diff --git a/README.md b/README.md index ebf2e1bf..99fae387 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@

- Setup PHP in GitHub Actions + Set up PHP in GitHub Actions

-

Setup PHP in GitHub Actions

+

Set up PHP in GitHub Actions

GitHub Actions status @@ -21,7 +21,7 @@ #StandWithUkraine

-Setup PHP with required extensions, php.ini configuration, code-coverage support and various tools like composer in [GitHub Actions](https://github.com/features/actions "GitHub Actions"). This action gives you a cross-platform interface to set up the PHP environment you need to test your application. Refer to [Usage](#memo-usage "How to use this") section and [examples](#examples "Examples of use") to see how to use this. +Set up PHP with required extensions, php.ini configuration, code-coverage support and various tools like composer in [GitHub Actions](https://github.com/features/actions "GitHub Actions"). This action gives you a cross-platform interface to set up the PHP environment you need to test your application. Refer to [Usage](#memo-usage "How to use this") section and [examples](#examples "Examples of use") to see how to use this. ## Contents @@ -133,7 +133,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string` - On `Ubuntu`, extensions which are available as a package, available on `PECL` or a git repository can be set up. ```yaml -- name: Setup PHP with PECL extension +- name: Set up PHP with PECL extension uses: shivammathur/setup-php@v2 with: php-version: '8.1' @@ -151,7 +151,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string` - Specific versions of extensions available on `PECL` can be set up by suffixing the extension's name with the version. This is useful for installing old versions of extensions which support end of life PHP versions. ```yaml -- name: Setup PHP with specific version of PECL extension +- name: Set up PHP with specific version of PECL extension uses: shivammathur/setup-php@v2 with: php-version: '5.4' @@ -161,7 +161,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string` - Extensions with pre-release versions available on `PECL` can be set up by suffixing the extension's name with its state i.e `alpha`, `beta`, `devel` or `snapshot`. ```yaml -- name: Setup PHP with pre-release PECL extension +- name: Set up PHP with pre-release PECL extension uses: shivammathur/setup-php@v2 with: php-version: '8.1' @@ -173,7 +173,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string` - Shared extensions can be disabled by prefixing them with a `:`. All extensions depending on the specified extension will also be disabled. ```yaml -- name: Setup PHP and disable opcache +- name: Set up PHP and disable opcache uses: shivammathur/setup-php@v2 with: php-version: '8.1' @@ -185,7 +185,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string` **Note:** This disables all core and third-party shared extensions and thus, can break some tools which need them. Required extensions are enabled again when the tools are set up on a best-effort basis. So it is recommended to add the extensions required for your tools after `none` in the `extensions` input to avoid any issues. ```yaml -- name: Setup PHP without any shared extensions except mbstring +- name: Set up PHP without any shared extensions except mbstring uses: shivammathur/setup-php@v2 with: php-version: '8.1' @@ -195,7 +195,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string` - 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 -- name: Setup PHP with intl +- name: Set up PHP with intl uses: shivammathur/setup-php@v2 with: php-version: '8.1' @@ -212,7 +212,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string` - By default, extensions which cannot be added or disabled gracefully leave an error message in the logs, the execution is not interrupted. To change this behaviour you can set `fail-fast` flag to `true`. ```yaml -- name: Setup PHP with fail-fast +- name: Set up PHP with fail-fast uses: shivammathur/setup-php@v2 with: php-version: '8.1' @@ -228,7 +228,7 @@ These tools can be set up globally using the `tools` input. It accepts a string [`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`], [`symfony`] or [`symfony-cli`], [`vapor`] or [`vapor-cli`], [`wp`] or [`wp-cli`] ```yaml -- name: Setup PHP with tools +- name: Set up PHP with tools uses: shivammathur/setup-php@v2 with: php-version: '8.1' @@ -238,7 +238,7 @@ These tools can be set up globally using the `tools` input. It accepts a string - In addition to above tools any composer tool or package can also be set up globally by specifying it as `vendor/package` matching the listing on Packagist. This format accepts the same [version constraints](https://getcomposer.org/doc/articles/versions.md#writing-version-constraints "Composer version constraints") as `composer`. ```yaml -- name: Setup PHP with tools +- name: Set up PHP with tools uses: shivammathur/setup-php@v2 with: php-version: '8.1' @@ -258,7 +258,7 @@ These tools can be set up globally using the `tools` input. It accepts a string You can do that by setting `GITHUB_TOKEN` environment variable. The `COMPOSER_TOKEN` environment variable has been deprecated in favor of `GITHUB_TOKEN` and will be removed in the next major version. ```yaml -- name: Setup PHP with tools +- name: Set up PHP with tools uses: shivammathur/setup-php@v2 with: php-version: '8.1' @@ -270,7 +270,7 @@ These tools can be set up globally using the `tools` input. It accepts a string - The latest stable version of `composer` is set up by default. You can set up the required `composer` version by specifying the major version `v1` or `v2`, or the version in `major.minor` or `semver` format. Additionally for composer `snapshot` and `preview` can also be specified to set up the respective releases. ```yaml -- name: Setup PHP with composer v2 +- name: Set up PHP with composer v2 uses: shivammathur/setup-php@v2 with: php-version: '8.1' @@ -280,7 +280,7 @@ These tools can be set up globally using the `tools` input. It accepts a string - If you do not use composer in your workflow, you can specify `tools: none` to skip it. ```yaml -- name: Setup PHP without composer +- name: Set up PHP without composer uses: shivammathur/setup-php@v2 with: php-version: '8.1' @@ -296,7 +296,7 @@ These tools can be set up globally using the `tools` input. It accepts a string - By default, expect `composer` tools which cannot be set up gracefully leave an error message in the logs, the execution is not interrupted. To change this behaviour you can set `fail-fast` flag to `true`. ```yaml -- name: Setup PHP with fail-fast +- name: Set up PHP with fail-fast uses: shivammathur/setup-php@v2 with: php-version: '8.1' @@ -318,7 +318,7 @@ Specify `coverage: xdebug` to use `Xdebug` and disable `PCOV`. Runs on all [PHP versions supported](#tada-php-support "List of PHP versions supported on this GitHub Action"). ```yaml -- name: Setup PHP with Xdebug +- name: Set up PHP with Xdebug uses: shivammathur/setup-php@v2 with: php-version: '8.1' @@ -329,7 +329,7 @@ Runs on all [PHP versions supported](#tada-php-support "List of PHP versions sup - If you need Xdebug 2.x on PHP 7.2, 7.3 or 7.4, you can specify `coverage: xdebug2`. ```yaml -- name: Setup PHP with Xdebug 2.x +- name: Set up PHP with Xdebug 2.x uses: shivammathur/setup-php@v2 with: php-version: '7.4' @@ -346,7 +346,7 @@ Runs on PHP 7.1 and newer PHP versions. - If your source code directory is other than `src`, `lib` or, `app`, specify `pcov.directory` using the `ini-values` input. ```yaml -- name: Setup PHP with PCOV +- name: Set up PHP with PCOV uses: shivammathur/setup-php@v2 with: php-version: '8.1' @@ -358,7 +358,7 @@ Runs on PHP 7.1 and newer PHP versions. - If you are using PHPUnit 5.x, 6.x or 7.x, you need to set up `pcov/clobber` before executing your tests. ```yaml -- name: Setup PCOV +- name: Set up PCOV run: | composer require pcov/clobber vendor/bin/pcov clobber @@ -376,7 +376,7 @@ Disable coverage for these reasons: - You are using PHP in JIT mode. Please refer to [JIT configuration](#jit-configuration) section for more details. ```yaml -- name: Setup PHP with no coverage driver +- name: Set up PHP with no coverage driver uses: shivammathur/setup-php@v2 with: php-version: '8.1' @@ -439,7 +439,7 @@ On GitHub Actions you can assign the `setup-php` step an `id`, you can use the s - Provides the PHP version in semver format. ```yaml -- name: Setup PHP +- name: Set up PHP id: setup-php uses: shivammathur/setup-php@v2 with: @@ -482,7 +482,7 @@ See below for more info. ```yaml steps: -- name: Setup PHP +- name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: '8.1' @@ -510,7 +510,7 @@ jobs: php-versions: '7.2' phpunit-versions: '8.5.21' steps: - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} @@ -529,7 +529,7 @@ jobs: ```yaml steps: -- name: Setup nightly PHP +- name: Set up nightly PHP uses: shivammathur/setup-php@v2 with: php-version: '8.2' @@ -551,9 +551,9 @@ steps: jobs: run: runs-on: windows-latest - name: Setup PHP TS on Windows + name: Set up PHP TS on Windows steps: - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: '8.1' diff --git a/__tests__/tools.test.ts b/__tests__/tools.test.ts index 0d717506..324cbd25 100644 --- a/__tests__/tools.test.ts +++ b/__tests__/tools.test.ts @@ -511,7 +511,7 @@ describe('Tools tests', () => { 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 "Set up 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"'} ${'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'} diff --git a/action.yml b/action.yml index 3ebbea84..81fa804f 100644 --- a/action.yml +++ b/action.yml @@ -1,4 +1,4 @@ -name: 'Setup PHP Action' +name: 'Set up PHP Action' author: shivammathur description: 'GitHub Action for PHP' branding: @@ -6,11 +6,11 @@ branding: icon: 'play-circle' inputs: php-version: - description: 'Setup PHP version.' + description: 'Set up PHP version.' default: '8.1' required: true extensions: - description: 'Setup PHP extensions.' + description: 'Set up PHP extensions.' required: false ini-file: description: 'Set base ini file.' @@ -19,11 +19,11 @@ inputs: ini-values: description: 'Add values to php.ini.' required: false - coverage: - description: 'Setup code coverage driver.' + coverage: + description: 'Set up code coverage driver.' required: false tools: - description: 'Setup popular tools globally.' + description: 'Set up popular tools globally.' required: false outputs: php-version: diff --git a/dist/index.js b/dist/index.js index dbe3b8c5..6dfc4c81 100644 --- a/dist/index.js +++ b/dist/index.js @@ -175,7 +175,7 @@ async function disableCoverage(version, os, pipe) { exports.disableCoverage = disableCoverage; async function addCoverage(coverage_driver, version, os) { coverage_driver = coverage_driver.toLowerCase(); - const script = '\n' + (await utils.stepLog('Setup Coverage', os)); + const script = '\n' + (await utils.stepLog('Set up Coverage', os)); const pipe = (await utils.suppressOutput(os)) + '\n'; switch (coverage_driver) { case 'pcov': @@ -394,7 +394,7 @@ async function addExtensionLinux(extension_csv, version) { } exports.addExtensionLinux = addExtensionLinux; async function addExtension(extension_csv, version, os, no_step = false) { - const log = await utils.stepLog('Setup Extensions', os); + const log = await utils.stepLog('Set up Extensions', os); let script = '\n'; switch (no_step) { case true: @@ -953,7 +953,7 @@ async function addTools(tools_csv, php_version, os) { return ''; } else { - script += await utils.stepLog('Setup Tools', os); + script += await utils.stepLog('Set up Tools', os); } const tools_list = await filterList(await utils.CSVArray(tools_csv)); await utils.asyncForEach(tools_list, async function (release) { @@ -4675,7 +4675,7 @@ module.exports = require("util"); /************************************************************************/ /******/ // The module cache /******/ var __webpack_module_cache__ = {}; -/******/ +/******/ /******/ // The require function /******/ function __nccwpck_require__(moduleId) { /******/ // Check if module is in cache @@ -4689,7 +4689,7 @@ module.exports = require("util"); /******/ // no module.loaded needed /******/ exports: {} /******/ }; -/******/ +/******/ /******/ // Execute the module function /******/ var threw = true; /******/ try { @@ -4698,23 +4698,23 @@ module.exports = require("util"); /******/ } finally { /******/ if(threw) delete __webpack_module_cache__[moduleId]; /******/ } -/******/ +/******/ /******/ // Return the exports of the module /******/ return module.exports; /******/ } -/******/ +/******/ /************************************************************************/ /******/ /* webpack/runtime/compat */ -/******/ +/******/ /******/ if (typeof __nccwpck_require__ !== 'undefined') __nccwpck_require__.ab = __dirname + "/"; -/******/ +/******/ /************************************************************************/ -/******/ +/******/ /******/ // startup /******/ // Load entry module and return exports /******/ // This entry module is referenced by other modules so it can't be inlined /******/ var __webpack_exports__ = __nccwpck_require__(39); /******/ module.exports = __webpack_exports__; -/******/ +/******/ /******/ })() -; \ No newline at end of file +; diff --git a/examples/bedrock.yml b/examples/bedrock.yml index 10d41f8f..cc87bb97 100644 --- a/examples/bedrock.yml +++ b/examples/bedrock.yml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} diff --git a/examples/blackfire-player.yml b/examples/blackfire-player.yml index 998c464d..04aefd61 100644 --- a/examples/blackfire-player.yml +++ b/examples/blackfire-player.yml @@ -22,12 +22,12 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} extensions: blackfire - # Setup Blackfire CLI and player + # Set up Blackfire CLI and player tools: blackfire, blackfire-player coverage: none diff --git a/examples/blackfire.yml b/examples/blackfire.yml index 610ff109..0eec6507 100644 --- a/examples/blackfire.yml +++ b/examples/blackfire.yml @@ -22,11 +22,11 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} - # Setup Blackfire extension and CLI + # Set up Blackfire extension and CLI extensions: blackfire tools: blackfire # Disable Xdebug and PCOV coverage drivers diff --git a/examples/cakephp-mysql.yml b/examples/cakephp-mysql.yml index f55d8257..2dba27f2 100644 --- a/examples/cakephp-mysql.yml +++ b/examples/cakephp-mysql.yml @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} @@ -78,7 +78,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: '8.1' @@ -111,7 +111,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: '8.1' diff --git a/examples/cakephp-postgres.yml b/examples/cakephp-postgres.yml index 04cbbc91..0f34ab87 100644 --- a/examples/cakephp-postgres.yml +++ b/examples/cakephp-postgres.yml @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} @@ -78,7 +78,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: '8.1' @@ -111,7 +111,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: '8.1' diff --git a/examples/cakephp.yml b/examples/cakephp.yml index 22e2a514..2978416b 100644 --- a/examples/cakephp.yml +++ b/examples/cakephp.yml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} @@ -50,7 +50,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: '8.1' @@ -82,7 +82,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: '8.1' diff --git a/examples/codeigniter.yml b/examples/codeigniter.yml index e01e8ae1..f402e8e5 100644 --- a/examples/codeigniter.yml +++ b/examples/codeigniter.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} diff --git a/examples/laminas-mvc.yml b/examples/laminas-mvc.yml index 0a7d7e4d..a2b0129f 100644 --- a/examples/laminas-mvc.yml +++ b/examples/laminas-mvc.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} diff --git a/examples/laravel-mysql.yml b/examples/laravel-mysql.yml index ab92596f..9ee818c4 100644 --- a/examples/laravel-mysql.yml +++ b/examples/laravel-mysql.yml @@ -40,7 +40,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} diff --git a/examples/laravel-postgres.yml b/examples/laravel-postgres.yml index 59994e6d..2f2f92da 100644 --- a/examples/laravel-postgres.yml +++ b/examples/laravel-postgres.yml @@ -42,7 +42,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} diff --git a/examples/laravel.yml b/examples/laravel.yml index aa7a8973..e8b2c061 100644 --- a/examples/laravel.yml +++ b/examples/laravel.yml @@ -15,7 +15,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} diff --git a/examples/lumen-mysql.yml b/examples/lumen-mysql.yml index af89d7f9..2cd0a8df 100644 --- a/examples/lumen-mysql.yml +++ b/examples/lumen-mysql.yml @@ -40,7 +40,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} diff --git a/examples/lumen-postgres.yml b/examples/lumen-postgres.yml index fd3f17e7..09995dad 100644 --- a/examples/lumen-postgres.yml +++ b/examples/lumen-postgres.yml @@ -42,7 +42,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} diff --git a/examples/lumen.yml b/examples/lumen.yml index e99e8235..22ca7066 100644 --- a/examples/lumen.yml +++ b/examples/lumen.yml @@ -15,7 +15,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} diff --git a/examples/phalcon-mysql.yml b/examples/phalcon-mysql.yml index 160d286e..d173ccd8 100644 --- a/examples/phalcon-mysql.yml +++ b/examples/phalcon-mysql.yml @@ -39,7 +39,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} diff --git a/examples/phalcon-postgres.yml b/examples/phalcon-postgres.yml index 987a2c72..42f42b6a 100644 --- a/examples/phalcon-postgres.yml +++ b/examples/phalcon-postgres.yml @@ -40,7 +40,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} @@ -81,4 +81,4 @@ jobs: vendor/bin/codecept build vendor/bin/codecept run env: - DB_PORT: ${{ job.services.postgres.ports['5432'] }} \ No newline at end of file + DB_PORT: ${{ job.services.postgres.ports['5432'] }} diff --git a/examples/sage.yml b/examples/sage.yml index 7735eef6..0f33ca07 100644 --- a/examples/sage.yml +++ b/examples/sage.yml @@ -14,13 +14,13 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Setup Node.js + - name: Set up Node.js uses: actions/setup-node@v1 with: node-version: ${{ matrix.node-versions }} # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} diff --git a/examples/slim-framework.yml b/examples/slim-framework.yml index 1bf7da46..74378000 100644 --- a/examples/slim-framework.yml +++ b/examples/slim-framework.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} diff --git a/examples/symfony-mysql.yml b/examples/symfony-mysql.yml index 5d176281..f8db2ee8 100644 --- a/examples/symfony-mysql.yml +++ b/examples/symfony-mysql.yml @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} diff --git a/examples/symfony-postgres.yml b/examples/symfony-postgres.yml index aec21a8d..5d5ba91a 100644 --- a/examples/symfony-postgres.yml +++ b/examples/symfony-postgres.yml @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} diff --git a/examples/symfony.yml b/examples/symfony.yml index e2370e76..0f52374a 100644 --- a/examples/symfony.yml +++ b/examples/symfony.yml @@ -15,7 +15,7 @@ jobs: uses: actions/checkout@v3 # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} diff --git a/examples/yii2-mysql.yml b/examples/yii2-mysql.yml index 20a1584a..4bf9f1ca 100644 --- a/examples/yii2-mysql.yml +++ b/examples/yii2-mysql.yml @@ -37,7 +37,7 @@ jobs: node-version: 10.x # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} diff --git a/examples/yii2-postgres.yml b/examples/yii2-postgres.yml index 2348cbab..6ef2abe4 100644 --- a/examples/yii2-postgres.yml +++ b/examples/yii2-postgres.yml @@ -37,7 +37,7 @@ jobs: node-version: 10.x # Docs: https://github.com/shivammathur/setup-php - - name: Setup PHP + - name: Set up PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} diff --git a/package.json b/package.json index 86540a64..0a080c9c 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "setup-php", "version": "2.21.0", "private": false, - "description": "Setup PHP for use with GitHub Actions", + "description": "Set up PHP for use with GitHub Actions", "main": "lib/install.js", "types": "lib/install.d.ts", "directories": { diff --git a/src/coverage.ts b/src/coverage.ts index fe4ab242..0e12f77a 100644 --- a/src/coverage.ts +++ b/src/coverage.ts @@ -134,7 +134,7 @@ export async function addCoverage( os: string ): Promise { coverage_driver = coverage_driver.toLowerCase(); - const script: string = '\n' + (await utils.stepLog('Setup Coverage', os)); + const script: string = '\n' + (await utils.stepLog('Set up Coverage', os)); const pipe: string = (await utils.suppressOutput(os)) + '\n'; switch (coverage_driver) { case 'pcov': diff --git a/src/extensions.ts b/src/extensions.ts index 63b5814c..36b3c264 100644 --- a/src/extensions.ts +++ b/src/extensions.ts @@ -344,7 +344,7 @@ export async function addExtension( os: string, no_step = false ): Promise { - const log: string = await utils.stepLog('Setup Extensions', os); + const log: string = await utils.stepLog('Set up Extensions', os); let script = '\n'; switch (no_step) { case true: diff --git a/src/scripts/darwin.sh b/src/scripts/darwin.sh index 9289b1bf..48663164 100644 --- a/src/scripts/darwin.sh +++ b/src/scripts/darwin.sh @@ -1,7 +1,7 @@ # Function to setup environment for self-hosted runners. self_hosted_helper() { if ! command -v brew >/dev/null; then - step_log "Setup Brew" + step_log "Set up Brew" get -q -e "/tmp/install.sh" "https://raw.githubusercontent.com/Homebrew/install/master/install.sh" && /tmp/install.sh >/dev/null 2>&1 add_log "${tick:?}" "Brew" "Installed Homebrew" fi @@ -237,9 +237,9 @@ get_scan_dir() { fi } -# Function to Setup PHP. +# Function to set up PHP. setup_php() { - step_log "Setup PHP" + step_log "Set up PHP" php_config="$(command -v php-config 2>/dev/null)" existing_version=$(get_brewed_php) if [[ "$version" =~ ${old_versions:?} ]]; then diff --git a/src/scripts/extensions/source.sh b/src/scripts/extensions/source.sh index 1b416ef6..15c203dd 100644 --- a/src/scripts/extensions/source.sh +++ b/src/scripts/extensions/source.sh @@ -137,7 +137,7 @@ add_extension_from_source() { prefix_opts="$(parse_args "$extension" CONFIGURE_PREFIX_OPTS)" suffix_opts="$(parse_args "$extension" CONFIGURE_SUFFIX_OPTS)" sub_dir="$(parse_args "$extension" PATH)" - step_log "Setup $slug" + step_log "Set up $slug" ( add_devtools phpize >/dev/null 2>&1 disable_extension_helper "$extension" diff --git a/src/scripts/linux.sh b/src/scripts/linux.sh index 32bfebe3..afef9525 100644 --- a/src/scripts/linux.sh +++ b/src/scripts/linux.sh @@ -210,9 +210,9 @@ add_php_config() { echo "$ini" | sudo tee "$current_ini" >/dev/null 2>&1 } -# Function to Setup PHP +# Function to set up PHP setup_php() { - step_log "Setup PHP" + step_log "Set up PHP" sudo mkdir -m 777 -p /var/run /run/php php_config="$(command -v php-config)" if [[ -z "$php_config" ]] || [ "$(php_semver | cut -c 1-3)" != "$version" ]; then diff --git a/src/scripts/win32.ps1 b/src/scripts/win32.ps1 index 7dfcbb76..4683d5e3 100644 --- a/src/scripts/win32.ps1 +++ b/src/scripts/win32.ps1 @@ -309,11 +309,11 @@ $src = Join-Path -Path $PSScriptRoot -ChildPath \.. . $src\scripts\extensions\add_extensions.ps1 Add-Printf >$null 2>&1 -Step-Log "Setup PhpManager" +Step-Log "Set up PhpManager" Install-PSPackage PhpManager PhpManager\PhpManager "$github/mlocati/powershell-phpmanager/releases/latest/download/PhpManager.zip" Get-Php >$null 2>&1 Add-Log $tick "PhpManager" "Installed" -Step-Log "Setup PHP" +Step-Log "Set up PHP" $installed = $null if (Test-Path -LiteralPath $php_dir -PathType Container) { try { diff --git a/src/tools.ts b/src/tools.ts index a2b7d7e4..3cd95244 100644 --- a/src/tools.ts +++ b/src/tools.ts @@ -484,7 +484,7 @@ export const functionRecord: Record Promise> = { }; /** - * Setup tools + * Set up tools * * @param tools_csv * @param php_version @@ -499,7 +499,7 @@ export async function addTools( if (tools_csv === 'none') { return ''; } else { - script += await utils.stepLog('Setup Tools', os); + script += await utils.stepLog('Set up Tools', os); } const tools_list = await filterList(await utils.CSVArray(tools_csv)); await utils.asyncForEach(tools_list, async function (release: string) {