fix composer

pkg/fanal/analyzer/language/php/composer/composer.go

@@ -100,11 +100,7 @@ func (a composerAnalyzer) Version() int {
 }
 
 func (a composerAnalyzer) parseComposerLock(path string, r dio.ReadSeekerAt) (*types.Application, error) {
-	libs, deps, err := a.lockParser.Parse(r)
-	if err != nil {
-		return nil, xerrors.Errorf("unable to parse composer.lock: %w", err)
-	}
-	return language.ToApplication(types.Composer, path, "", libs, deps), nil
+	return language.Parse(types.Composer, path, r, a.lockParser)
 }
 
 func (a composerAnalyzer) mergeComposerJson(fsys fs.FS, dir string, app *types.Application) error {

pkg/fanal/analyzer/language/php/composer/composer_test.go

@@ -27,21 +27,31 @@ func Test_composerAnalyzer_PostAnalyze(t *testing.T) {
 						FilePath: "composer.lock",
 						Libraries: []types.Package{
 							{
-								ID:        "pear/[email protected]",
-								Name:      "pear/log",
-								Version:   "1.13.3",
-								Indirect:  false,
-								Licenses:  []string{"MIT"},
-								Locations: []types.Location{{StartLine: 9, EndLine: 68}},
+								ID:       "pear/[email protected]",
+								Name:     "pear/log",
+								Version:  "1.13.3",
+								Indirect: false,
+								Licenses: []string{"MIT"},
+								Locations: []types.Location{
+									{
+										StartLine: 9,
+										EndLine:   68,
+									},
+								},
 								DependsOn: []string{"pear/[email protected]"},
 							},
 							{
-								ID:        "pear/[email protected]",
-								Name:      "pear/pear_exception",
-								Version:   "v1.0.2",
-								Indirect:  true,
-								Licenses:  []string{"BSD-2-Clause"},
-								Locations: []types.Location{{StartLine: 69, EndLine: 127}},
+								ID:       "pear/[email protected]",
+								Name:     "pear/pear_exception",
+								Version:  "v1.0.2",
+								Indirect: true,
+								Licenses: []string{"BSD-2-Clause"},
+								Locations: []types.Location{
+									{
+										StartLine: 69,
+										EndLine:   127,
+									},
+								},
 							},
 						},
 					},
@@ -58,21 +68,31 @@ func Test_composerAnalyzer_PostAnalyze(t *testing.T) {
 						FilePath: "composer.lock",
 						Libraries: []types.Package{
 							{
-								ID:        "pear/[email protected]",
-								Name:      "pear/log",
-								Version:   "1.13.3",
-								Indirect:  false,
-								Licenses:  []string{"MIT"},
-								Locations: []types.Location{{StartLine: 9, EndLine: 68}},
+								ID:       "pear/[email protected]",
+								Name:     "pear/log",
+								Version:  "1.13.3",
+								Indirect: false,
+								Licenses: []string{"MIT"},
+								Locations: []types.Location{
+									{
+										StartLine: 9,
+										EndLine:   68,
+									},
+								},
 								DependsOn: []string{"pear/[email protected]"},
 							},
 							{
-								ID:        "pear/[email protected]",
-								Name:      "pear/pear_exception",
-								Version:   "v1.0.2",
-								Indirect:  false,
-								Licenses:  []string{"BSD-2-Clause"},
-								Locations: []types.Location{{StartLine: 69, EndLine: 127}},
+								ID:       "pear/[email protected]",
+								Name:     "pear/pear_exception",
+								Version:  "v1.0.2",
+								Indirect: false,
+								Licenses: []string{"BSD-2-Clause"},
+								Locations: []types.Location{
+									{
+										StartLine: 69,
+										EndLine:   127,
+									},
+								},
 							},
 						},
 					},
@@ -82,7 +102,7 @@ func Test_composerAnalyzer_PostAnalyze(t *testing.T) {
 		{
 			name:    "broken composer.lock",
 			dir:     "testdata/sad",
-			wantErr: "unable to parse composer.lock",
+			wantErr: "failed to parse composer.lock",
 		},
 	}