Merge pull request #114 from paketo-buildpacks/php-fix

Supports more specific plan combinations for PHP + web servers
paketo-buildpacks · Jun 21, 2024 · b6a3a5b · b6a3a5b
2 parents 0bec80e + 3536c4d
commit b6a3a5b
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/dt/detect.go b/dt/detect.go
@@ -40,6 +40,26 @@ func (d Detect) Detect(context libcnb.DetectContext) (libcnb.DetectResult, error
 	return libcnb.DetectResult{
 		Pass: true,
 		Plans: []libcnb.BuildPlan{
+			{
+				Provides: []libcnb.BuildPlanProvide{
+					{Name: "dynatrace-php"},
+				},
+				Requires: []libcnb.BuildPlanRequire{
+					{Name: "dynatrace-php"},
+					{Name: "php"},
+					{Name: "httpd"},
+				},
+			},
+			{
+				Provides: []libcnb.BuildPlanProvide{
+					{Name: "dynatrace-php"},
+				},
+				Requires: []libcnb.BuildPlanRequire{
+					{Name: "dynatrace-php"},
+					{Name: "php"},
+					{Name: "nginx"},
+				},
+			},
 			{
 				Provides: []libcnb.BuildPlanProvide{
 					{Name: "dynatrace-apache"},

diff --git a/dt/detect_test.go b/dt/detect_test.go
@@ -29,6 +29,26 @@ import (
 var expectedResult = libcnb.DetectResult{
 	Pass: true,
 	Plans: []libcnb.BuildPlan{
+		{
+			Provides: []libcnb.BuildPlanProvide{
+					{Name: "dynatrace-php"},
+			},
+			Requires: []libcnb.BuildPlanRequire{
+					{Name: "dynatrace-php"},
+					{Name: "php"},
+					{Name: "httpd"},
+			},
+		},	
+		{
+			Provides: []libcnb.BuildPlanProvide{
+				{Name: "dynatrace-php"},
+			},
+			Requires: []libcnb.BuildPlanRequire{
+				{Name: "dynatrace-php"},
+				{Name: "php"},
+				{Name: "nginx"},
+			},
+		},
 		{
 			Provides: []libcnb.BuildPlanProvide{
 				{Name: "dynatrace-apache"},