feat(php): Implement PHP analyser

Author: elldritch

analyzers/analyzer.go

@@ -8,6 +8,7 @@ import (
 	"github.com/fossas/fossa-cli/analyzers/golang"
 	"github.com/fossas/fossa-cli/analyzers/gradle"
 	"github.com/fossas/fossa-cli/analyzers/nodejs"
+	"github.com/fossas/fossa-cli/analyzers/php"
 	"github.com/fossas/fossa-cli/analyzers/python"
 	"github.com/fossas/fossa-cli/analyzers/ruby"
 
@@ -48,7 +49,7 @@ func New(key pkg.Type, options map[string]interface{}) (Analyzer, error) {
 	case pkg.Cocoapods:
 		return nil, ErrAnalyzerNotImplemented
 	case pkg.Composer:
-		return nil, ErrAnalyzerNotImplemented
+		return php.New(options)
 	case pkg.Go:
 		return golang.New(options)
 	case pkg.Gradle:

analyzers/bower/bower.go

@@ -28,6 +28,11 @@ type Analyzer struct {
 	Options Options
 }
 
+// TODO: strategies:
+// - bower list
+// - read components
+// - read manifest
+
 type Options struct {
 	Strategy      string `mapstructure:"strategy"`
 	ComponentsDir string `mapstructure:"components"`

analyzers/bower/tool.go

@@ -132,7 +132,7 @@ func (a *Analyzer) RevisionContextualLookup(project Project, gopkg gocmd.Package
 // with) the project, or otherwise don't have revisions.
 func (a *Analyzer) UnresolvedOK(project Project, gopkg gocmd.Package) bool {
 	withinDir :=
-		strings.HasPrefix(gopkg.Dir, project.Dir) && strings.Index(gopkg.Dir, "/vendor/") == -1
+		strings.HasPrefix(gopkg.Dir, project.Dir) && !strings.Contains(gopkg.Dir, "/vendor/")
 
 	allowedPrefixes := strings.Split(a.Options.AllowUnresolvedPrefix, " ")
 	hasAllowedPrefix := false

analyzers/golang/revision.go

@@ -52,7 +52,7 @@ func Unvendor(importpath string) string {
 // if none exists.
 func VendorParent(dirname string) string {
 	separator := filepath.FromSlash("/vendor/")
-	if strings.Index(dirname, separator) == -1 {
+	if !strings.Contains(dirname, separator) {
 		return "."
 	}
 	sections := strings.Split(dirname, separator)

analyzers/golang/util.go

@@ -90,17 +90,11 @@ func (a *Analyzer) Discover(dir string) ([]module.Module, error) {
 				return err
 			}
 			for _, project := range projects {
-				// TODO: this won't work until v2 configuration files are implemented.
-				// modules = append(modules, module.Module{
-				// 	Name:        name,
-				// 	Type:        pkg.Gradle,
-				// 	BuildTarget: project + ":compile",
-				// 	Dir:         dir,
-				// })
 				modules = append(modules, module.Module{
-					Name:        name,
+					Name:        filepath.Join(name, project),
 					Type:        pkg.Gradle,
 					BuildTarget: dir,
+					Dir:         dir,
 					Options: map[string]interface{}{
 						"project": project,
 					},
@@ -138,30 +132,31 @@ func (a *Analyzer) Analyze(m module.Module) (module.Module, error) {
 		Dir:    m.Dir,
 		Online: a.Options.Online,
 	}
+	var imports []gradle.Dependency
 	var deps map[gradle.Dependency][]gradle.Dependency
 	var err error
 	if a.Options.Task != "" {
-		deps, err = g.DependenciesTask(strings.Split(a.Options.Task, " ")...)
+		imports, deps, err = g.DependenciesTask(strings.Split(a.Options.Task, " ")...)
 		if err != nil {
 			return m, err
 		}
 	} else if a.Options.Project != "" {
-		deps, err = g.Dependencies(a.Options.Project, a.Options.Configuration)
+		imports, deps, err = g.Dependencies(a.Options.Project, a.Options.Configuration)
 		if err != nil {
 			return m, err
 		}
 	} else {
 		targets := strings.Split(m.BuildTarget, ":")
-		deps, err = g.Dependencies(targets[0], targets[1])
+		imports, deps, err = g.Dependencies(targets[0], targets[1])
 		if err != nil {
 			return m, err
 		}
 	}
 
 	// Set direct dependencies.
-	var imports []pkg.Import
-	for _, dep := range deps[gradle.Root] {
-		imports = append(imports, pkg.Import{
+	var i []pkg.Import
+	for _, dep := range imports {
+		i = append(i, pkg.Import{
 			Target: dep.Target,
 			Resolved: pkg.ID{
 				Type:     pkg.Gradle,
@@ -200,7 +195,7 @@ func (a *Analyzer) Analyze(m module.Module) (module.Module, error) {
 		}
 	}
 
-	m.Imports = imports
+	m.Imports = i
 	m.Deps = graph
 	return m, nil
 }

analyzers/gradle/gradle.go

@@ -201,7 +201,7 @@ func (builder *MavenBuilder) IsBuilt(m module.Module, allowUnresolved bool) (boo
 		Argv: []string{"dependency:list", "-B"},
 	})
 	if err != nil {
-		if strings.Index(output, "Could not find artifact") != -1 {
+		if strings.Contains(output, "Could not find artifact") {
 			return false, nil
 		}
 		return false, err

analyzers/maven/maven.go

@@ -255,6 +255,8 @@ func (a *Analyzer) Analyze(m module.Module) (module.Module, error) {
 	return m, nil
 }
 
+// TODO: implement this generically in package graph (Bower also has an
+// implementation)
 func recurseDeps(pkgMap map[pkg.ID]pkg.Package, p npm.Output) {
 	for name, dep := range p.Dependencies {
 		// Construct ID.