Skip to content

Commit 6db1a06

Browse files
committed
Improve support for blackfire-player
1 parent 52eb86c commit 6db1a06

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

__tests__/tools.test.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,9 @@ describe('Tools tests', () => {
265265

266266
it.each`
267267
version | php_version | url
268-
${'latest'} | ${'7.4'} | ${'https://get.blackfire.io/blackfire-player.phar'}
268+
${'latest'} | ${'8.1'} | ${'https://get.blackfire.io/blackfire-player.phar'}
269269
${'1.2.3'} | ${'7.4'} | ${'https://get.blackfire.io/blackfire-player-v1.2.3.phar'}
270+
${'latest'} | ${'7.4'} | ${'https://get.blackfire.io/blackfire-player-v1.22.0.phar'}
270271
${'latest'} | ${'5.5'} | ${'https://get.blackfire.io/blackfire-player-v1.9.3.phar'}
271272
${'latest'} | ${'7.0'} | ${'https://get.blackfire.io/blackfire-player-v1.9.3.phar'}
272273
`(
@@ -376,7 +377,7 @@ describe('Tools tests', () => {
376377
[
377378
'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',
378379
'add_blackfire',
379-
'add_tool https://get.blackfire.io/blackfire-player.phar blackfire-player "-V"',
380+
'add_tool https://get.blackfire.io/blackfire-player-v1.22.0.phar blackfire-player "-V"',
380381
'add_tool https://github.com/bmitch/churn-php/releases/latest/download/churn.phar churn "-V"',
381382
'add_tool https://github.com/staabm/annotate-pull-request-from-checkstyle/releases/latest/download/cs2pr cs2pr "-V"',
382383
'add_composertool flex flex symfony/ global',
@@ -417,7 +418,7 @@ describe('Tools tests', () => {
417418
'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',
418419
'add_composertool behat behat behat/ scoped',
419420
'add_blackfire',
420-
'add_tool https://get.blackfire.io/blackfire-player.phar blackfire-player "-V"',
421+
'add_tool https://get.blackfire.io/blackfire-player-v1.22.0.phar blackfire-player "-V"',
421422
'add_tool https://github.com/bmitch/churn-php/releases/latest/download/churn.phar churn "-V"',
422423
'add_tool https://github.com/ergebnis/composer-normalize/releases/latest/download/composer-normalize.phar composer-normalize "-V"',
423424
'add_composertool composer-require-checker composer-require-checker maglnet/ scoped',

dist/index.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -759,9 +759,13 @@ async function addPackage(data) {
759759
}
760760
exports.addPackage = addPackage;
761761
async function addBlackfirePlayer(data) {
762-
if (/5\.[5-6]|7\.0/.test(data['php_version']) &&
763-
data['version'] == 'latest') {
764-
data['version'] = '1.9.3';
762+
if (data['version'] == 'latest') {
763+
if (/5\.[5-6]|7\.0/.test(data['php_version'])) {
764+
data['version'] = '1.9.3';
765+
}
766+
else if (/7\.[1-4]|8\.0/.test(data['php_version'])) {
767+
data['version'] = '1.22.0';
768+
}
765769
}
766770
data['url'] = await getPharUrl(data);
767771
return addArchive(data);

src/tools.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,12 @@ export async function addPackage(data: RS): Promise<string> {
218218
* @param data
219219
*/
220220
export async function addBlackfirePlayer(data: RS): Promise<string> {
221-
if (
222-
/5\.[5-6]|7\.0/.test(data['php_version']) &&
223-
data['version'] == 'latest'
224-
) {
225-
data['version'] = '1.9.3';
221+
if (data['version'] == 'latest') {
222+
if (/5\.[5-6]|7\.0/.test(data['php_version'])) {
223+
data['version'] = '1.9.3';
224+
} else if (/7\.[1-4]|8\.0/.test(data['php_version'])) {
225+
data['version'] = '1.22.0';
226+
}
226227
}
227228
data['url'] = await getPharUrl(data);
228229
return addArchive(data);

0 commit comments

Comments
 (0)