From 6158538131427bcdb07e246927c1a2690ee7664e Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Wed, 24 Jun 2020 04:30:50 +0530 Subject: [PATCH] Add support for phplint --- README.md | 2 +- __tests__/tools.test.ts | 3 ++- dist/index.js | 5 ++++- src/tools.ts | 5 ++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a7c97b0a..ebfa8c4b 100644 --- a/README.md +++ b/README.md @@ -148,7 +148,7 @@ with: These tools can be setup globally using the `tools` input. -`blackfire`, `blackfire-player`, `codeception`, `composer`, `composer-prefetcher`, `cs2pr`, `deployer`, `flex`, `infection`, `pecl`, `phan`, `phinx`, `phive`, `phpcbf`, `phpcpd`, `php-config`, `php-cs-fixer`, `phpcs`, `phpize`, `phpmd`, `phpstan`, `phpunit`, `prestissimo`, `psalm`, `symfony`, `vapor-cli` +`blackfire`, `blackfire-player`, `codeception`, `composer`, `composer-prefetcher`, `cs2pr`, `deployer`, `flex`, `infection`, `pecl`, `phan`, `phinx`, `phive`, `php-config`, `php-cs-fixer`, `phpcbf`, `phpcpd`, `phpcs`, `phpize`, `phplint`, `phpmd`, `phpstan`, `phpunit`, `prestissimo`, `psalm`, `symfony`, `vapor-cli` ```yaml uses: shivammathur/setup-php@v2 diff --git a/__tests__/tools.test.ts b/__tests__/tools.test.ts index 863b7dc5..987a19f2 100644 --- a/__tests__/tools.test.ts +++ b/__tests__/tools.test.ts @@ -384,7 +384,7 @@ describe('Tools tests', () => { it('checking addTools on linux', async () => { const script: string = await tools.addTools( - 'blackfire, blackfire-player, cs2pr, flex, php-cs-fixer, phpstan, phpunit, pecl, phinx, phinx:1.2.3, phive, php-config, phpize, symfony, wp-cli', + 'blackfire, blackfire-player, cs2pr, flex, php-cs-fixer, phplint, phpstan, phpunit, pecl, phinx, phinx:1.2.3, phive, php-config, phpize, symfony, wp-cli', '7.4', 'linux' ); @@ -419,6 +419,7 @@ describe('Tools tests', () => { expect(script).toContain('add_pecl'); expect(script).toContain('add_composertool flex flex symfony/'); expect(script).toContain('add_composertool phinx phinx robmorgan/'); + expect(script).toContain('add_composertool phplint phplint overtrue/'); expect(script).toContain('add_composertool phinx phinx:1.2.3 robmorgan/'); expect(script).toContain('add_devtools'); expect(script).toContain('add_log "$tick" "php-config" "Added"'); diff --git a/dist/index.js b/dist/index.js index 1ffe2e6f..99011146 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1918,7 +1918,7 @@ async function getCleanedToolsList(tools_csv) { .map(function (extension) { return extension .trim() - .replace(/symfony\/|laravel\/|robmorgan\/|hirak\/|narrowspark\/automatic-/, ''); + .replace(/hirak\/|laravel\/|narrowspark\/automatic-|overtrue\/|robmorgan\/|symfony\//, ''); }) .filter(Boolean); return [...new Set(tools_list)]; @@ -2062,6 +2062,9 @@ async function addTools(tools_csv, php_version, os_version) { case 'phinx': script += await addPackage(tool, release, 'robmorgan/', os_version); break; + case 'phplint': + script += await addPackage(tool, release, 'overtrue/', os_version); + break; case 'prestissimo': script += await addPackage(tool, release, 'hirak/', os_version); break; diff --git a/src/tools.ts b/src/tools.ts index acea374b..7f2e723d 100644 --- a/src/tools.ts +++ b/src/tools.ts @@ -358,7 +358,7 @@ export async function getCleanedToolsList( return extension .trim() .replace( - /symfony\/|laravel\/|robmorgan\/|hirak\/|narrowspark\/automatic-/, + /hirak\/|laravel\/|narrowspark\/automatic-|overtrue\/|robmorgan\/|symfony\//, '' ); }) @@ -539,6 +539,9 @@ export async function addTools( case 'phinx': script += await addPackage(tool, release, 'robmorgan/', os_version); break; + case 'phplint': + script += await addPackage(tool, release, 'overtrue/', os_version); + break; case 'prestissimo': script += await addPackage(tool, release, 'hirak/', os_version); break;