feat: [OSM-2746] Removed support for non-JSON platform deps parsing

Author: nico-incubiq

lib/composer-cmds.ts

@@ -1,21 +1,16 @@
 import * as path from 'path';
 import * as childProcess from 'child_process';
 
-export const composerVersionCmd = {command: 'composer', args: ['--version']};
-export const composerShowCmd = {command: 'composer', args: ['show', '-p']};
-export const pharVersionCmd = {
-  command: `php`,
-  args: [`${path.resolve(path.resolve() + '/composer.phar')}`, '--version']
-};
-export const pharShowCmd = {
-  command: `php`,
-  args: [`${path.resolve(path.resolve() + '/composer.phar')}`, 'show', '-p', '--format=json']
-};
+export const composerCmd = {command: 'composer', args: []};
+export const composerPharCmd = {command: 'php', args: [`${path.resolve(path.resolve() + '/composer.phar')}`]};
+
+export const versionArgs = {args: ['--version']};
+export const showArgs = {args: ['show', '-p', '--format=json']};
 
 function cleanUpComposerWarnings(composerOutput: string): string {
-  // Remove all lines preceding the JSON data; including Deprecation messages and blank lines.
+  // Remove all lines preceding the JSON data; including "Deprecated" messages and blank lines.
   const lines = composerOutput.split('\n');
-  const jsonStartIndex = lines.findIndex((line) => line.length > 0 && !line.startsWith('Deprecated:'));
+  const jsonStartIndex = lines.findIndex((line) => line.startsWith('{'));
 
   return lines.slice(jsonStartIndex).join('\n');
 }

lib/system-deps.ts

@@ -1,34 +1,27 @@
-import * as os from 'os';
-import { SystemPackages } from '@snyk/composer-lockfile-parser';
+import {SystemPackages} from '@snyk/composer-lockfile-parser';
 
 import * as cmds from './composer-cmds';
-import { PhpOptions } from './types';
+import {PhpOptions} from './types';
 
-function isSet(variable): boolean {
+function isSet(variable: boolean | undefined): boolean {
   return typeof variable !== 'undefined';
 }
 
 export function systemDeps(basePath: string, options: PhpOptions): SystemPackages {
   const composerOk = isSet(options.composerIsFine) ?
-    options.composerIsFine : cmds.cmdReturnsOk(cmds.composerVersionCmd.command, cmds.composerVersionCmd.args);
+    options.composerIsFine : cmds.cmdReturnsOk(cmds.composerCmd.command, [...cmds.composerCmd.args, ...cmds.versionArgs.args]);
   const composerPharOk = isSet(options.composerPharIsFine) ?
-    options.composerPharIsFine : cmds.cmdReturnsOk(cmds.pharVersionCmd.command, cmds.pharVersionCmd.args);
+    options.composerPharIsFine : cmds.cmdReturnsOk(cmds.composerPharCmd.command, [...cmds.composerPharCmd.args, ...cmds.versionArgs.args]);
 
   let finalVersionsObj = {};
 
   if (options.systemVersions && (Object.keys(options.systemVersions).length > 0)) {
     // give first preference to a stub
     finalVersionsObj = options.systemVersions;
-  } else if (composerOk) {
-    const lines = cmds.execWithResult(cmds.composerShowCmd.command, basePath, cmds.composerShowCmd.args).split(os.EOL);
-    lines.forEach((line) => {
-      const [part1, part2] = line.split(/\s+/);
-      if (part2) {
-        finalVersionsObj[part1] = part2;
-      }
-    });
-  } else if (composerPharOk) {
-    const output = cmds.execWithResult(cmds.pharShowCmd.command, basePath, cmds.pharShowCmd.args);
+  } else if (composerOk || composerPharOk) {
+    const composer = composerOk ? cmds.composerCmd : cmds.composerPharCmd;
+
+    const output = cmds.execWithResult(composer.command, basePath, [...composer.args, ...cmds.showArgs.args]);
     const versionsObj = JSON.parse(output).platform;
 
     versionsObj.forEach(({name, version}) => {