From dc9461a05370ecebeb5b957bc47f700d5f860937 Mon Sep 17 00:00:00 2001
From: Jaapio <jaap@ijaap.nl>
Date: Tue, 25 Feb 2020 22:09:10 +0100
Subject: [PATCH 1/4] Add blackfire to linux install

Add logging about install process

Fix formating of semversion blackfire

Only add version when needed

Pass phpversion
---
 __tests__/extensions.test.ts |  6 ++++++
 __tests__/utils.test.ts      |  7 +++++++
 dist/index.js                | 24 ++++++++++++++++++++++++
 src/extensions.ts            | 14 ++++++++++++++
 src/scripts/ext/blackfire.sh | 23 +++++++++++++++++++++++
 src/utils.ts                 | 11 +++++++++++
 6 files changed, 85 insertions(+)
 create mode 100644 src/scripts/ext/blackfire.sh

diff --git a/__tests__/extensions.test.ts b/__tests__/extensions.test.ts
index 3ef06a23..74d9522c 100644
--- a/__tests__/extensions.test.ts
+++ b/__tests__/extensions.test.ts
@@ -63,6 +63,12 @@ describe('Extension tests', () => {
     linux = await extensions.addExtension('phalcon3, phalcon4', '7.3', 'linux');
     expect(linux).toContain('phalcon.sh phalcon3 7.3');
     expect(linux).toContain('phalcon.sh phalcon4 7.3');
+
+    linux = await extensions.addExtension('blackfire', '7.3', 'linux');
+    expect(linux).toContain('blackfire.sh 7.3 73');
+
+    linux = await extensions.addExtension('blackfire-1.31.0', '7.3', 'linux');
+    expect(linux).toContain('blackfire.sh 7.3 73 1.31.0');
   });
 
   it('checking addExtensionOnDarwin', async () => {
diff --git a/__tests__/utils.test.ts b/__tests__/utils.test.ts
index 59dcb80e..79e58023 100644
--- a/__tests__/utils.test.ts
+++ b/__tests__/utils.test.ts
@@ -161,4 +161,11 @@ describe('Utils tests', () => {
       'Platform fedora is not supported'
     );
   });
+
+  it('checking getMinorVersion', async () => {
+    expect(await utils.getMinorVersion('7.14.0')).toEqual('7.14');
+    expect(await utils.getMinorVersion('7.4')).toEqual('7.4');
+    expect(await utils.getMinorVersion('7.4.1')).toEqual('7.4');
+    expect(await utils.getMinorVersion('7.aa')).toEqual('7.aa');
+  });
 });
diff --git a/dist/index.js b/dist/index.js
index 17eec80a..6a8d5fd3 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -1247,6 +1247,17 @@ function suppressOutput(os_version) {
     });
 }
 exports.suppressOutput = suppressOutput;
+function getMinorVersion(version) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const regex = /^\d+\.\d+/;
+        const match = version.match(regex);
+        if (match === null) {
+            return version;
+        }
+        return match[0];
+    });
+}
+exports.getMinorVersion = getMinorVersion;
 
 
 /***/ }),
@@ -2810,6 +2821,19 @@ function addExtensionLinux(extension_csv, version, pipe) {
                 const prefix = yield utils.getExtensionPrefix(ext_name);
                 let install_command = '';
                 switch (true) {
+                    // match blackfire... blackfire-1.31.0
+                    case /^blackfire(-\d+\.\d+\.\d+)?$/.test(extension):
+                        script +=
+                            '\nsh ' +
+                                path.join(__dirname, '../src/scripts/ext/blackfire.sh') +
+                                ' ' +
+                                version +
+                                ' ' +
+                                (yield utils.getMinorVersion(version)).replace('.', '');
+                        if (ext_version) {
+                            script += ' ' + ext_version;
+                        }
+                        return;
                     // match pre-release versions
                     case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
                         script +=
diff --git a/src/extensions.ts b/src/extensions.ts
index 62f68d13..58e621e1 100644
--- a/src/extensions.ts
+++ b/src/extensions.ts
@@ -155,6 +155,20 @@ export async function addExtensionLinux(
     const prefix = await utils.getExtensionPrefix(ext_name);
     let install_command = '';
     switch (true) {
+      // match blackfire... blackfire-1.31.0
+      case /^blackfire(-\d+\.\d+\.\d+)?$/.test(extension):
+        script +=
+          '\nsh ' +
+          path.join(__dirname, '../src/scripts/ext/blackfire.sh') +
+          ' ' +
+          version +
+          ' ' +
+          (await utils.getMinorVersion(version)).replace('.', '');
+
+        if (ext_version) {
+          script += ' ' + ext_version;
+        }
+        return;
       // match pre-release versions
       case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
         script +=
diff --git a/src/scripts/ext/blackfire.sh b/src/scripts/ext/blackfire.sh
new file mode 100644
index 00000000..1dfd35ff
--- /dev/null
+++ b/src/scripts/ext/blackfire.sh
@@ -0,0 +1,23 @@
+add_log() {
+  mark=$1
+  subject=$2
+  message=$3
+  if [ "$mark" = "$tick" ]; then
+    printf "\033[32;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
+  else
+    printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
+  fi
+}
+
+phpversion=$2
+blackfireVersion=${3:-1.31.0}
+ini_file="/etc/php/$1/cli/conf.d/50-blackfire.ini"
+tick="✓"
+cross="✗"
+
+(curl -A "Github action" -o /tmp/blackfire.so -L -s https://packages.blackfire.io/binaries/blackfire-php/$blackfireVersion/blackfire-php-linux_amd64-php-$phpversion.so >/dev/null 2>&1 && \
+sudo mv /tmp/blackfire.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so >/dev/null 2>&1 && \
+echo "extension=blackfire.so" | sudo tee -a "$ini_file" >/dev/null 2>&1 && \
+add_log "$tick" "blackfire" "Installed and enabled") || \
+add_log "$cross" "blackfire" "Could not install blackfire"
+
diff --git a/src/utils.ts b/src/utils.ts
index af305504..88cc4805 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -261,3 +261,14 @@ export async function suppressOutput(os_version: string): Promise<string> {
       );
   }
 }
+
+export async function getMinorVersion(version: string): Promise<string> {
+  const regex = /^\d+\.\d+/;
+  const match = version.match(regex);
+
+  if (match === null) {
+    return version;
+  }
+
+  return match[0];
+}

From 943f4918300ffa573943cd4c53f623388b36fb09 Mon Sep 17 00:00:00 2001
From: Jaapio <jaap@ijaap.nl>
Date: Wed, 26 Feb 2020 23:59:45 +0100
Subject: [PATCH 2/4] Add blackfire on OSX

---
 __tests__/extensions.test.ts        | 12 ++++++++++++
 dist/index.js                       | 25 +++++++++++++++++++++++++
 src/extensions.ts                   | 27 +++++++++++++++++++++++++++
 src/scripts/ext/blackfire_darwin.sh | 23 +++++++++++++++++++++++
 4 files changed, 87 insertions(+)
 create mode 100644 src/scripts/ext/blackfire_darwin.sh

diff --git a/__tests__/extensions.test.ts b/__tests__/extensions.test.ts
index 74d9522c..cf3ddbf7 100644
--- a/__tests__/extensions.test.ts
+++ b/__tests__/extensions.test.ts
@@ -25,6 +25,12 @@ describe('Extension tests', () => {
 
     win32 = await extensions.addExtension('xdebug', '7.2', 'fedora');
     expect(win32).toContain('Platform fedora is not supported');
+
+    win32 = await extensions.addExtension('blackfire', '7.3', 'win32');
+    expect(win32).toContain('blackfire.ps1 7.3 73');
+
+    win32 = await extensions.addExtension('blackfire-1.31.0', '7.3', 'win32');
+    expect(win32).toContain('blackfire.ps1 7.3 73 1.31.0');
   });
 
   it('checking addExtensionOnLinux', async () => {
@@ -126,6 +132,12 @@ describe('Extension tests', () => {
     expect(darwin).toContain('brew install pkg-config imagemagick');
     expect(darwin).toContain('sudo pecl install -f imagick');
 
+    darwin = await extensions.addExtension('blackfire', '7.3', 'darwin');
+    expect(darwin).toContain('blackfire_darwin.sh 7.3 73');
+
+    darwin = await extensions.addExtension('blackfire-1.31.0', '7.3', 'darwin');
+    expect(darwin).toContain('blackfire_darwin.sh 7.3 73 1.31.0');
+
     darwin = await extensions.addExtension(
       'does_not_exist',
       '7.2',
diff --git a/dist/index.js b/dist/index.js
index 6a8d5fd3..62837264 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2733,6 +2733,18 @@ function addExtensionDarwin(extension_csv, version, pipe) {
                                 ' ' +
                                 version;
                         return;
+                    case /^blackfire(-\d+\.\d+\.\d+)?$/.test(extension):
+                        script +=
+                            '\nsh ' +
+                                path.join(__dirname, '../src/scripts/ext/blackfire_darwin.sh') +
+                                ' ' +
+                                version +
+                                ' ' +
+                                (yield utils.getMinorVersion(version)).replace('.', '');
+                        if (ext_version) {
+                            script += ' ' + ext_version;
+                        }
+                        return;
                     default:
                         install_command = 'sudo pecl install -f ' + extension + pipe;
                         break;
@@ -2768,6 +2780,19 @@ function addExtensionWindows(extension_csv, version, pipe) {
                 const version_extension = version + extension;
                 let matches;
                 switch (true) {
+                    // match blackfire...blackfire-1.31.0
+                    case /^blackfire(-\d+\.\d+\.\d+)?$/.test(extension):
+                        script +=
+                            '\nsh ' +
+                                path.join(__dirname, '../src/scripts/ext/blackfire.ps1') +
+                                ' ' +
+                                version +
+                                ' ' +
+                                (yield utils.getMinorVersion(version)).replace('.', '');
+                        if (ext_version) {
+                            script += ' ' + ext_version;
+                        }
+                        return;
                     // match pre-release versions
                     case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
                         script += '\nAdd-Extension ' + ext_name + ' ' + ext_version;
diff --git a/src/extensions.ts b/src/extensions.ts
index 58e621e1..632b541d 100644
--- a/src/extensions.ts
+++ b/src/extensions.ts
@@ -63,6 +63,19 @@ export async function addExtensionDarwin(
           ' ' +
           version;
         return;
+      case /^blackfire(-\d+\.\d+\.\d+)?$/.test(extension):
+        script +=
+          '\nsh ' +
+          path.join(__dirname, '../src/scripts/ext/blackfire_darwin.sh') +
+          ' ' +
+          version +
+          ' ' +
+          (await utils.getMinorVersion(version)).replace('.', '');
+
+        if (ext_version) {
+          script += ' ' + ext_version;
+        }
+        return;
       default:
         install_command = 'sudo pecl install -f ' + extension + pipe;
         break;
@@ -98,6 +111,20 @@ export async function addExtensionWindows(
     const version_extension: string = version + extension;
     let matches: RegExpExecArray;
     switch (true) {
+      // match blackfire...blackfire-1.31.0
+      case /^blackfire(-\d+\.\d+\.\d+)?$/.test(extension):
+        script +=
+          '\nsh ' +
+          path.join(__dirname, '../src/scripts/ext/blackfire.ps1') +
+          ' ' +
+          version +
+          ' ' +
+          (await utils.getMinorVersion(version)).replace('.', '');
+
+        if (ext_version) {
+          script += ' ' + ext_version;
+        }
+        return;
       // match pre-release versions
       case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
         script += '\nAdd-Extension ' + ext_name + ' ' + ext_version;
diff --git a/src/scripts/ext/blackfire_darwin.sh b/src/scripts/ext/blackfire_darwin.sh
new file mode 100644
index 00000000..f6b137cf
--- /dev/null
+++ b/src/scripts/ext/blackfire_darwin.sh
@@ -0,0 +1,23 @@
+# Function to log result of a operation
+add_log() {
+  mark=$1
+  subject=$2
+  message=$3
+  if [ "$mark" = "$tick" ]; then
+    printf "\033[32;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
+  else
+    printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message"
+  fi
+}
+
+tick="✓"
+cross="✗"
+phpversion=$2
+blackfireVersion=${3:-1.31.0}
+ini_file=$(php -d "date.timezone=UTC" --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
+
+(curl -A "Github action" -o /tmp/blackfire.so -L -s https://packages.blackfire.io/binaries/blackfire-php/$blackfireVersion/blackfire-php-darwin_amd64-php-$phpversion.so && \
+sudo mv /tmp/blackfire.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so && \
+echo "extension=blackfire.so" >>"$ini_file" && \
+add_log "$tick" "blackfire" "Installed and enabled") || \
+add_log "$cross" "blackfire" "Could not install blackfire"

From 3dfd7a648b2905f2c3130999e6a9897527025210 Mon Sep 17 00:00:00 2001
From: Jaapio <jaap@ijaap.nl>
Date: Thu, 27 Feb 2020 09:19:30 +0100
Subject: [PATCH 3/4] Add blackfire support on windows

---
 __tests__/extensions.test.ts  |  4 ++--
 dist/index.js                 | 28 +++++++++++++---------------
 src/extensions.ts             | 30 ++++++++++++++----------------
 src/scripts/ext/blackfire.ps1 | 27 +++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 33 deletions(-)
 create mode 100644 src/scripts/ext/blackfire.ps1

diff --git a/__tests__/extensions.test.ts b/__tests__/extensions.test.ts
index cf3ddbf7..02e44365 100644
--- a/__tests__/extensions.test.ts
+++ b/__tests__/extensions.test.ts
@@ -27,10 +27,10 @@ describe('Extension tests', () => {
     expect(win32).toContain('Platform fedora is not supported');
 
     win32 = await extensions.addExtension('blackfire', '7.3', 'win32');
-    expect(win32).toContain('blackfire.ps1 7.3 73');
+    expect(win32).toContain('blackfire.ps1 73');
 
     win32 = await extensions.addExtension('blackfire-1.31.0', '7.3', 'win32');
-    expect(win32).toContain('blackfire.ps1 7.3 73 1.31.0');
+    expect(win32).toContain('blackfire.ps1 73 1.31.0');
   });
 
   it('checking addExtensionOnLinux', async () => {
diff --git a/dist/index.js b/dist/index.js
index 62837264..749c1d37 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2692,6 +2692,18 @@ function addExtensionDarwin(extension_csv, version, pipe) {
                 const prefix = yield utils.getExtensionPrefix(ext_name);
                 let install_command = '';
                 switch (true) {
+                    case /^blackfire(-\d+\.\d+\.\d+)?$/.test(extension):
+                        script +=
+                            '\nsh ' +
+                                path.join(__dirname, '../src/scripts/ext/blackfire_darwin.sh') +
+                                ' ' +
+                                version +
+                                ' ' +
+                                (yield utils.getMinorVersion(version)).replace('.', '');
+                        if (ext_version) {
+                            script += ' ' + ext_version;
+                        }
+                        return;
                     // match pre-release versions
                     case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
                         script +=
@@ -2733,18 +2745,6 @@ function addExtensionDarwin(extension_csv, version, pipe) {
                                 ' ' +
                                 version;
                         return;
-                    case /^blackfire(-\d+\.\d+\.\d+)?$/.test(extension):
-                        script +=
-                            '\nsh ' +
-                                path.join(__dirname, '../src/scripts/ext/blackfire_darwin.sh') +
-                                ' ' +
-                                version +
-                                ' ' +
-                                (yield utils.getMinorVersion(version)).replace('.', '');
-                        if (ext_version) {
-                            script += ' ' + ext_version;
-                        }
-                        return;
                     default:
                         install_command = 'sudo pecl install -f ' + extension + pipe;
                         break;
@@ -2783,11 +2783,9 @@ function addExtensionWindows(extension_csv, version, pipe) {
                     // match blackfire...blackfire-1.31.0
                     case /^blackfire(-\d+\.\d+\.\d+)?$/.test(extension):
                         script +=
-                            '\nsh ' +
+                            '\n& ' +
                                 path.join(__dirname, '../src/scripts/ext/blackfire.ps1') +
                                 ' ' +
-                                version +
-                                ' ' +
                                 (yield utils.getMinorVersion(version)).replace('.', '');
                         if (ext_version) {
                             script += ' ' + ext_version;
diff --git a/src/extensions.ts b/src/extensions.ts
index 632b541d..c423053f 100644
--- a/src/extensions.ts
+++ b/src/extensions.ts
@@ -22,6 +22,19 @@ export async function addExtensionDarwin(
     const prefix = await utils.getExtensionPrefix(ext_name);
     let install_command = '';
     switch (true) {
+      case /^blackfire(-\d+\.\d+\.\d+)?$/.test(extension):
+        script +=
+          '\nsh ' +
+          path.join(__dirname, '../src/scripts/ext/blackfire_darwin.sh') +
+          ' ' +
+          version +
+          ' ' +
+          (await utils.getMinorVersion(version)).replace('.', '');
+
+        if (ext_version) {
+          script += ' ' + ext_version;
+        }
+        return;
       // match pre-release versions
       case /.*-(beta|alpha|devel|snapshot)/.test(version_extension):
         script +=
@@ -63,19 +76,6 @@ export async function addExtensionDarwin(
           ' ' +
           version;
         return;
-      case /^blackfire(-\d+\.\d+\.\d+)?$/.test(extension):
-        script +=
-          '\nsh ' +
-          path.join(__dirname, '../src/scripts/ext/blackfire_darwin.sh') +
-          ' ' +
-          version +
-          ' ' +
-          (await utils.getMinorVersion(version)).replace('.', '');
-
-        if (ext_version) {
-          script += ' ' + ext_version;
-        }
-        return;
       default:
         install_command = 'sudo pecl install -f ' + extension + pipe;
         break;
@@ -114,11 +114,9 @@ export async function addExtensionWindows(
       // match blackfire...blackfire-1.31.0
       case /^blackfire(-\d+\.\d+\.\d+)?$/.test(extension):
         script +=
-          '\nsh ' +
+          '\n& ' +
           path.join(__dirname, '../src/scripts/ext/blackfire.ps1') +
           ' ' +
-          version +
-          ' ' +
           (await utils.getMinorVersion(version)).replace('.', '');
 
         if (ext_version) {
diff --git a/src/scripts/ext/blackfire.ps1 b/src/scripts/ext/blackfire.ps1
new file mode 100644
index 00000000..f7955b49
--- /dev/null
+++ b/src/scripts/ext/blackfire.ps1
@@ -0,0 +1,27 @@
+Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    [string]
+    $phpversion,
+    [Parameter(Position = 1, Mandatory = $true)]
+    [ValidateNotNull()]
+    [ValidateLength(1, [int]::MaxValue)]
+    [string]
+    $version = '1.31.0'
+)
+
+Function Install-Blackfire() {
+    $installed = Get-Php -Path $php_dir
+    $nts = if (!$installed.ThreadSafe) { "_nts" } else { "" }
+    Invoke-WebRequest -UseBasicParsing -Uri "https://packages.blackfire.io/binaries/blackfire-php/${version}/blackfire-php-windows_x64-php-${phpversion}${nts}.dll" -OutFile $ENV:RUNNER_TOOL_CACHE\blackfire.dll > $null 2>&1
+    Copy-Item -Path "$ENV:RUNNER_TOOL_CACHE\blackfire.dll" -Destination "$ext_dir\blackfire.dll"
+    Enable-PhpExtension -Extension blackfire -Path $php_dir
+    printf "\033[%s;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s \033[0m\n" "32" $tick "Blackfire" "Installed and enabled"
+}
+
+$tick = ([char]8730)
+$php_dir = 'C:\tools\php'
+$ext_dir = $php_dir + '\ext'
+
+Install-Blackfire
+

From 311eb9f3baf508ff2053e7c7e4ef1d19049dc0ee Mon Sep 17 00:00:00 2001
From: Jaapio <jaap@ijaap.nl>
Date: Thu, 27 Feb 2020 10:57:09 +0100
Subject: [PATCH 4/4] Add example

---
 README.md              |  3 +++
 examples/blackfire.yml | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 examples/blackfire.yml

diff --git a/README.md b/README.md
index d39fc121..9d8c64a7 100644
--- a/README.md
+++ b/README.md
@@ -107,6 +107,8 @@ with:
   extensions: xdebug-beta
 ```
 
+- Blackfire PHP extension is available for install.
+
 - Extensions which cannot be installed gracefully leave an error message in the logs, the action is not interrupted.
 
 ## :wrench: Tools Support
@@ -489,6 +491,7 @@ Examples for setting up this GitHub Action with different PHP Frameworks/Package
 |Yii2 Starter Kit with `MySQL`|`ubuntu`|[yii2-mysql.yml](./examples/yii2-mysql.yml "GitHub Action for Yii2 Starter Kit with MySQL")|
 |Yii2 Starter Kit with `PostgreSQL`|`ubuntu`|[yii2-postgres.yml](./examples/yii2-postgres.yml "GitHub Action for Yii2 Starter Kit with PostgreSQL")|
 |Zend Framework|`macOS`, `ubuntu` and `windows`|[zend-framework.yml](./examples/zend-framework.yml "GitHub Action for Zend Framework")|
+|Blackfire|`macOS`, `ubuntu` and `windows`|[blackfire.yml](./examples/blackfire.yml "GitHub Action using blackfire")|
 
 ## :scroll: License
 
diff --git a/examples/blackfire.yml b/examples/blackfire.yml
new file mode 100644
index 00000000..af0ecac5
--- /dev/null
+++ b/examples/blackfire.yml
@@ -0,0 +1,32 @@
+# GitHub Action for blackfire
+name: Profiling with blackfire
+on: [push, pull_request]
+jobs:
+  bedrock:
+    name: Blackfire (PHP ${{ matrix.php-versions }})
+    runs-on: ${{ matrix.operating-system }}
+    services:
+      blackfire:
+        image: blackfire/blackfire
+        ports:
+          - 8707:8707
+        env:
+          BLACKFIRE_SERVER_ID: "<id>"
+          BLACKFIRE_SERVER_TOKEN: "<token>"
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-latest, windows-latest, macos-latest]
+        php-versions: ['7.1', '7.2', '7.3', '7.4']
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: blackfire-1.30.0
+          ini-values: blackfire.agent_socket=tcp://localhost:8707
+      - name: Profile
+        # Note that blackfire agent is not installed. So an implementation with the sdk is required!
+        run: php your-blackfire-sdk-script.php