Skip to content

Commit 8c2f6d2

Browse files
lirshindalmanlshindelman
andauthored
fix: adding require-dev to rootRequires in parseComposerJson (CycloneDX#2064)
* agging require-dev to rootRequires in parseComposerJson Signed-off-by: lshindelman <[email protected]> * add test for parseComposerJson Signed-off-by: lshindelman <[email protected]> * add test for parseComposerJson Signed-off-by: lshindelman <[email protected]> --------- Signed-off-by: lshindelman <[email protected]> Co-authored-by: lshindelman <[email protected]>
1 parent c0b3a87 commit 8c2f6d2

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

lib/helpers/utils.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10499,7 +10499,10 @@ export function parseComposerJson(composerJsonFile) {
1049910499
const composerData = JSON.parse(
1050010500
readFileSync(composerJsonFile, { encoding: "utf-8" }),
1050110501
);
10502-
const rootRequires = composerData.require;
10502+
const rootRequires = {
10503+
...composerData.require,
10504+
...composerData["require-dev"],
10505+
};
1050310506
const pkgName = composerData.name;
1050410507
if (pkgName) {
1050510508
moduleParent.group = dirname(pkgName);

lib/helpers/utils.test.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import {
3939
parseCmakeDotFile,
4040
parseCmakeLikeFile,
4141
parseCocoaDependency,
42+
parseComposerJson,
4243
parseComposerLock,
4344
parseConanData,
4445
parseConanLockData,
@@ -4466,6 +4467,14 @@ test("parseComposerLock", () => {
44664467
});
44674468
});
44684469

4470+
test("parseComposerJson", () => {
4471+
let retMap = parseComposerJson("./test/data/composer.json");
4472+
expect(Object.keys(retMap.rootRequires).length).toEqual(1);
4473+
4474+
retMap = parseComposerJson("./test/data/composer-2.json");
4475+
expect(Object.keys(retMap.rootRequires).length).toEqual(31);
4476+
});
4477+
44694478
test("parseGemfileLockData", async () => {
44704479
let retMap = await parseGemfileLockData(
44714480
readFileSync("./test/data/Gemfile.lock", { encoding: "utf-8" }),

types/lib/helpers/utils.d.ts.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)