Skip to content

Commit 287979a

Browse files
authored
Merge pull request #948 from alcaeus/add-pie-support
Add tool support for pie
2 parents d000f49 + dd94278 commit 287979a

3 files changed

Lines changed: 19 additions & 7 deletions

File tree

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ This disables all core and third-party shared extensions and thus, can break som
229229

230230
These tools can be set up globally using the `tools` input. It accepts a string in csv-format.
231231

232-
[`behat`], [`blackfire`], [`blackfire-player`], [`box`], [`castor`], [`churn`], [`codeception`], [`composer`], [`composer-dependency-analyser`], [`composer-normalize`], [`composer-prefetcher`], [`composer-require-checker`], [`composer-unused`], [`cs2pr`], [`deployer`], [`ecs`], [`flex`], [`grpc_php_plugin`], [`infection`], [`parallel-lint`], [`pecl`], [`phan`], [`phing`], [`phinx`], [`phive`], [`php-config`], [`php-cs-fixer`], [`php-scoper`], [`phpcbf`], [`phpcpd`], [`phpcs`], [`phpdoc`] or [`phpDocumentor`], [`phpize`], [`phplint`], [`phpmd`], [`phpspec`], [`phpstan`], [`phpunit`], [`phpunit-bridge`], [`phpunit-polyfills`], [`pint`], [`prestissimo`], [`protoc`], [`psalm`], [`rector`], [`symfony`] or [`symfony-cli`], [`vapor`] or [`vapor-cli`], [`wp`] or [`wp-cli`]
232+
[`behat`], [`blackfire`], [`blackfire-player`], [`box`], [`castor`], [`churn`], [`codeception`], [`composer`], [`composer-dependency-analyser`], [`composer-normalize`], [`composer-prefetcher`], [`composer-require-checker`], [`composer-unused`], [`cs2pr`], [`deployer`], [`ecs`], [`flex`], [`grpc_php_plugin`], [`infection`], [`parallel-lint`], [`pecl`], [`phan`], [`phing`], [`phinx`], [`phive`], [`php-config`], [`php-cs-fixer`], [`php-scoper`], [`phpcbf`], [`phpcpd`], [`phpcs`], [`phpdoc`] or [`phpDocumentor`], [`phpize`], [`phplint`], [`phpmd`], [`phpspec`], [`phpstan`], [`phpunit`], [`phpunit-bridge`], [`phpunit-polyfills`], [`pie`], [`pint`], [`prestissimo`], [`protoc`], [`psalm`], [`rector`], [`symfony`] or [`symfony-cli`], [`vapor`] or [`vapor-cli`], [`wp`] or [`wp-cli`]
233233

234234
```yaml
235235
- name: Setup PHP with tools
@@ -1086,6 +1086,7 @@ These companies generously provide setup-php their products and services to aid
10861086
[`phpunit`]: https://phpunit.de/
10871087
[`phpunit-bridge`]: https://symfony.com/doc/current/components/phpunit_bridge.html
10881088
[`phpunit-polyfills`]: https://github.com/Yoast/PHPUnit-Polyfills
1089+
[`pie`]: https://github.com/php/pie
10891090
[`pint`]: https://github.com/laravel/pint
10901091
[`prestissimo`]: https://github.com/hirak/prestissimo
10911092
[`protoc`]: https://developers.google.com/protocol-buffers/

__tests__/tools.test.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ describe('Tools tests', () => {
392392

393393
it.each([
394394
[
395-
'blackfire, blackfire-player, box, churn, cs2pr, flex, grpc_php_plugin, parallel-lint, php-cs-fixer, php-scoper, phpDocumentor, phplint, phpstan, phpunit, pecl, phing, phinx, phinx:1.2.3, phive, phpunit-bridge, phpunit-polyfills, pint, php-config, phpize, protoc, symfony, vapor, wp',
395+
'blackfire, blackfire-player, box, churn, cs2pr, flex, grpc_php_plugin, parallel-lint, php-cs-fixer, php-scoper, phpDocumentor, phplint, phpstan, phpunit, pecl, phing, phinx, phinx:1.2.3, phive, phpunit-bridge, phpunit-polyfills, pint, php-config, phpize, protoc, symfony, vapor, wp, pie',
396396
[
397397
'add_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',
398398
'add_blackfire',
@@ -422,7 +422,8 @@ describe('Tools tests', () => {
422422
'add_protoc latest',
423423
'add_symfony latest',
424424
'add_composer_tool vapor-cli vapor-cli laravel/ scoped',
425-
'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli "--version"'
425+
'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli "--version"',
426+
'add_tool https://github.com/php/pie/releases/latest/download/pie.phar pie "-V"'
426427
]
427428
]
428429
])('checking addTools on linux', async (tools_csv, scripts) => {
@@ -434,7 +435,7 @@ describe('Tools tests', () => {
434435

435436
it.each([
436437
[
437-
'behat, blackfire, blackfire-player, churn, composer-dependency-analyser, composer-normalize, composer-require-checker, composer-unused, cs2pr:1.2.3, ecs, flex, grpc_php_plugin:1.2.3, infection, phan, phan:1.2.3, phing:1.2.3, phinx, phive:1.2.3, php-config, phpcbf, phpcpd, phpcs, phpdoc, phpize, phpmd, phpspec, phpunit-bridge:5.6, phpunit-polyfills:1.0.1, protoc:v1.2.3, psalm, rector, symfony-cli, vapor-cli, wp-cli',
438+
'behat, blackfire, blackfire-player, churn, composer-dependency-analyser, composer-normalize, composer-require-checker, composer-unused, cs2pr:1.2.3, ecs, flex, grpc_php_plugin:1.2.3, infection, phan, phan:1.2.3, phing:1.2.3, phinx, phive:1.2.3, php-config, phpcbf, phpcpd, phpcs, phpdoc, phpize, phpmd, phpspec, phpunit-bridge:5.6, phpunit-polyfills:1.0.1, protoc:v1.2.3, psalm, rector, symfony-cli, vapor-cli, wp-cli, pie',
438439
[
439440
'add_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',
440441
'add_composer_tool behat behat behat/ scoped',
@@ -470,7 +471,8 @@ describe('Tools tests', () => {
470471
'add_symfony latest',
471472
'add_composer_tool vapor-cli vapor-cli laravel/ scoped',
472473
'add_tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli "--version"',
473-
'add_composer_tool easy-coding-standard easy-coding-standard symplify/ scoped'
474+
'add_composer_tool easy-coding-standard easy-coding-standard symplify/ scoped',
475+
'add_tool https://github.com/php/pie/releases/latest/download/pie.phar pie "-V"'
474476
]
475477
]
476478
])('checking addTools on darwin', async (tools_csv, scripts) => {
@@ -482,7 +484,7 @@ describe('Tools tests', () => {
482484

483485
it.each([
484486
[
485-
'blackfire, blackfire-player:1.2.3, cs2pr, churn, deployer, does_not_exist, flex, phinx, phive:0.13.2, php-config, phpize, phpmd, simple-phpunit, symfony, wp',
487+
'blackfire, blackfire-player:1.2.3, cs2pr, churn, deployer, does_not_exist, flex, phinx, phive:0.13.2, php-config, phpize, phpmd, simple-phpunit, symfony, wp, pie',
486488
[
487489
'Add-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',
488490
'Add-Blackfire',
@@ -499,7 +501,8 @@ describe('Tools tests', () => {
499501
'Add-Tool https://github.com/phpmd/phpmd/releases/latest/download/phpmd.phar phpmd "--version"',
500502
'Add-ComposerTool phpunit-bridge phpunit-bridge symfony/ global',
501503
'Add-Symfony',
502-
'Add-Tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli "--version"'
504+
'Add-Tool https://github.com/wp-cli/builds/blob/gh-pages/phar/wp-cli.phar?raw=true wp-cli "--version"',
505+
'Add-Tool https://github.com/php/pie/releases/latest/download/pie.phar pie "-V"'
503506
]
504507
]
505508
])('checking addTools on Windows', async (tools_csv, scripts) => {

src/configs/tools.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,14 @@
136136
"version_prefix": "",
137137
"version_parameter": "-V"
138138
},
139+
"pie": {
140+
"type": "phar",
141+
"repository": "php/pie",
142+
"extension": ".phar",
143+
"domain": "https://github.com",
144+
"version_prefix": "",
145+
"version_parameter": "-V"
146+
},
139147
"pint": {
140148
"type": "phar",
141149
"repository": "laravel/pint",

0 commit comments

Comments
 (0)