Fix extension logs

Refactor utils.addCommand

src/coverage.ts

@@ -16,7 +16,7 @@ export async function checkXdebugError(
 }
 
 /**
- * Function to setup Xdebug
+ * Function to set up Xdebug
  *
  * @param extension
  * @param version
@@ -30,9 +30,8 @@ export async function addCoverageXdebug(
   pipe: string
 ): Promise<string> {
   let script = '\n';
-  let message: string = await checkXdebugError(extension, version);
-  let status = '$cross';
-  if (!message) {
+  const error: string = await checkXdebugError(extension, version);
+  if (!error) {
     script +=
       (await extensions.addExtension(':pcov:false', version, os, true)) + pipe;
     extension = extension == 'xdebug3' ? 'xdebug' : extension;
@@ -43,15 +42,17 @@ export async function addCoverageXdebug(
       'php -r "echo phpversion(\'xdebug\');"',
       os
     );
-    message = 'Xdebug $xdebug_version enabled as coverage driver';
-    status = '$tick';
+    script +=
+      (await utils.getCommand(os, 'extension_log')) +
+      'xdebug "Xdebug $xdebug_version enabled as coverage driver"';
+  } else {
+    script += await utils.addLog('$cross', extension, error, os);
   }
-  script += await utils.addLog(status, extension, message, os);
   return script;
 }
 
 /**
- * Function to setup PCOV
+ * Function to set up PCOV
  *
  * @param version
  * @param os
@@ -76,14 +77,9 @@ export async function addCoveragePCOV(
         'php -r "echo phpversion(\'pcov\');"',
         os
       );
-      // success
-      script += await utils.addLog(
-        '$tick',
-        'coverage: pcov',
-        'PCOV $pcov_version enabled as coverage driver',
-        os
-      );
-      // version is not supported
+      script +=
+        (await utils.getCommand(os, 'extension_log')) +
+        'pcov "PCOV $pcov_version enabled as coverage driver"';
       break;
 
     case /5\.[3-6]|7\.0/.test(version):

src/scripts/extensions/add_extensions.ps1

@@ -1,3 +1,20 @@
+Function Add-ExtensionLog() {
+  Param (
+    [Parameter(Position = 0, Mandatory = $true)]
+    [ValidateNotNull()]
+    $extension,
+    [Parameter(Position = 1, Mandatory = $true)]
+    [ValidateNotNull()]
+    $message
+  )
+  $extension_info = Get-PhpExtension -Path $php_dir | Where-Object { $_.Name -eq $extension -or $_.Handle -eq $extension }
+  if ($null -ne $extension_info -and ($extension_info.State -eq 'Enabled' -or $extension_info.State -eq 'Builtin')) {
+    Add-Log $tick $extension $message
+  } else {
+    Add-Log $cross $extension "Could not install $extension on PHP $( $installed.FullVersion )"
+  }
+}
+
 # Function to link dependencies to PHP directory.
 Function Set-ExtensionPrerequisites
 {

src/scripts/extensions/http.ps1

@@ -47,10 +47,5 @@ Function Add-Http() {
   }
   Add-Extension pecl_http >$null 2>&1
   Repair-ICU
-  try {
-    php --ri "http" 2> $null | Out-Null
-    Add-Log $tick "http" "Installed and enabled"
-  } catch {
-    Add-Log $cross "http" "Could not install http on PHP $( $installed.FullVersion )"
-  }
+  Add-ExtensionLog http "Installed and enabled"
 }

src/scripts/tools/add_tools.ps1

@@ -183,7 +183,7 @@ Function Add-Tool() {
   }
 }
 
-Function Add-ComposertoolHelper() {
+Function Add-ComposerToolHelper() {
   Param (
     [Parameter(Position = 0, Mandatory = $true)]
     [string]
@@ -234,7 +234,7 @@ Function Add-ComposertoolHelper() {
 }
 
 # Function to setup a tool using composer.
-Function Add-Composertool() {
+Function Add-ComposerTool() {
   Param (
     [Parameter(Position = 0, Mandatory = $true)]
     [ValidateNotNull()]
@@ -267,7 +267,7 @@ Function Add-Composertool() {
     }
   }
   Enable-PhpExtension -Extension curl, mbstring, openssl -Path $php_dir
-  $log = Add-ComposertoolHelper $tool $release $prefix $scope $composer_args
+  $log = Add-ComposerToolHelper $tool $release $prefix $scope $composer_args
   if(Test-Path $composer_bin\composer) {
     Copy-Item -Path "$bin_dir\composer" -Destination "$composer_bin\composer" -Force
   }

src/scripts/tools/add_tools.sh

@@ -153,7 +153,7 @@ add_tool() {
 }
 
 # Function to setup a tool using composer in a different scope.
-add_composertool_helper() {
+add_composer_tool_helper() {
   tool=$1
   release=$2
   prefix=$3
@@ -184,7 +184,7 @@ add_composertool_helper() {
 }
 
 # Function to setup a tool using composer.
-add_composertool() {
+add_composer_tool() {
   tool=$1
   release=$2
   prefix=$3
@@ -199,7 +199,7 @@ add_composertool() {
       return
     fi
   fi
-  add_composertool_helper "$tool" "$release" "$prefix" "$scope" "$composer_args"
+  add_composer_tool_helper "$tool" "$release" "$prefix" "$scope" "$composer_args"
   tool_version=$(get_tool_version cat /tmp/composer.log)
   ([ -s /tmp/composer.log ] && add_log "$tick" "$tool" "Added $tool $tool_version"
   ) || add_log "$cross" "$tool" "Could not setup $tool"

src/tools.ts

@@ -201,7 +201,7 @@ export async function addArchive(data: RS): Promise<string> {
  * @param data
  */
 export async function addPackage(data: RS): Promise<string> {
-  const command = await utils.getCommand(data['os'], 'composertool');
+  const command = await utils.getCommand(data['os'], 'composer_tool');
   const parts: string[] = data['repository'].split('/');
   const args: string = await utils.joins(
     parts[1],

src/utils.ts

@@ -320,7 +320,14 @@ export async function getCommand(os: string, suffix: string): Promise<string> {
     case 'darwin':
       return 'add_' + suffix + ' ';
     case 'win32':
-      return 'Add-' + suffix.charAt(0).toUpperCase() + suffix.slice(1) + ' ';
+      return (
+        'Add-' +
+        suffix
+          .split('_')
+          .map((part: string) => part.charAt(0).toUpperCase() + part.slice(1))
+          .join('') +
+        ' '
+      );
     default:
       return await log('Platform ' + os + ' is not supported', os, 'error');
   }