php tests

README.md

@@ -300,8 +300,8 @@ Maven version:
 
 #### Version Detection
   - `.tool-versions` - `nodejs {VERSION}`
-  - `.nvmrc` - `{VERSION}`
-  - `.node-version` - `{VERSION}`
+  - `.nvmrc` - `v{VERSION}`
+  - `.node-version` - `v{VERSION}`
 
 #### Runtime Image
 `node:${VERSION}-slim`

runtime/node.go

@@ -246,6 +246,10 @@ func findNodeVersion(path string, log *slog.Logger) (*string, error) {
 						version = strings.TrimPrefix(line, "v")
 						log.Info("Detected Node version in " + file + ": " + version)
 						break
+					} else {
+						version = line
+						log.Info("Detected Node version in " + file + ": " + version)
+						break
 					}
 				}
 

runtime/php.go

@@ -57,18 +57,27 @@ func (d *PHP) GenerateDockerfile(path string) ([]byte, error) {
 	}
 
 	packageManager := ""
+	npmInstallCMD := ""
 	if _, err := os.Stat(filepath.Join(path, "package-lock.json")); err == nil {
 		packageManager = "npm"
-		installCMD = installCMD + " && npm ci"
+		npmInstallCMD = "npm ci"
 	} else if _, err := os.Stat(filepath.Join(path, "pnpm-lock.yaml")); err == nil {
 		packageManager = "pnpm"
-		installCMD = installCMD + " && corepack enable pnpm && pnpm i --frozen-lockfile"
+		npmInstallCMD = "corepack enable pnpm && pnpm i --frozen-lockfile"
 	} else if _, err := os.Stat(filepath.Join(path, "yarn.lock")); err == nil {
 		packageManager = "yarn"
-		installCMD = installCMD + " && yarn --frozen-lockfile"
+		npmInstallCMD = "yarn --frozen-lockfile"
 	} else if _, err := os.Stat(filepath.Join(path, "bun.lockb")); err == nil {
 		packageManager = "bun"
-		installCMD = installCMD + " && bun install"
+		npmInstallCMD = "bun install"
+	}
+
+	if npmInstallCMD != "" {
+		if installCMD == "" {
+			installCMD = npmInstallCMD
+		} else {
+			installCMD = fmt.Sprintf("%s && %s", installCMD, npmInstallCMD)
+		}
 	}
 
 	buildCMD := ""

runtime/php_test.go

@@ -0,0 +1,110 @@
+package runtime_test
+
+import (
+	"regexp"
+	"strings"
+	"testing"
+
+	"github.com/flexstack/new-dockerfile/runtime"
+)
+
+func TestPHPMatch(t *testing.T) {
+	tests := []struct {
+		name     string
+		path     string
+		expected bool
+	}{
+		{
+			name:     "PHP project",
+			path:     "../testdata/php",
+			expected: true,
+		},
+		{
+			name:     "PHP project with composer",
+			path:     "../testdata/php-composer",
+			expected: true,
+		},
+		{
+			name:     "PHP project with NPM",
+			path:     "../testdata/php-npm",
+			expected: true,
+		},
+		{
+			name:     "Not a PHP project",
+			path:     "../testdata/deno",
+			expected: false,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			php := &runtime.PHP{Log: logger}
+			if php.Match(test.path) != test.expected {
+				t.Errorf("expected %v, got %v", test.expected, php.Match(test.path))
+			}
+		})
+	}
+}
+
+func TestPHPGenerateDockerfile(t *testing.T) {
+	tests := []struct {
+		name     string
+		path     string
+		expected []any
+	}{
+		{
+			name:     "PHP project",
+			path:     "../testdata/php",
+			expected: []any{`ARG VERSION=8.3`, regexp.MustCompile(`^ARG BUILD_CMD=$`), `ARG START_CMD="apache2-foreground`},
+		},
+		{
+			name:     "PHP project with composer",
+			path:     "../testdata/php-composer",
+			expected: []any{`ARG VERSION=5.3`, `ARG INSTALL_CMD="composer update \u0026\u0026 composer install --prefer-dist --no-dev --optimize-autoloader --no-interaction"`, regexp.MustCompile(`^ARG BUILD_CMD=$`), `ARG START_CMD="apache2-foreground`},
+		},
+		{
+			name:     "PHP project with NPM",
+			path:     "../testdata/php-npm",
+			expected: []any{`ARG VERSION=8.2.0`, `ARG INSTALL_CMD="yarn --frozen-lockfile"`, `ARG BUILD_CMD="yarn run build"`, `ARG START_CMD="apache2-foreground`},
+		},
+		{
+			name:     "Not a PHP project",
+			path:     "../testdata/deno",
+			expected: []any{`ARG VERSION=8.3`, regexp.MustCompile(`^ARG INSTALL_CMD=$`), regexp.MustCompile(`^ARG BUILD_CMD=$`), `ARG START_CMD="apache2-foreground`},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			php := &runtime.PHP{Log: logger}
+			dockerfile, err := php.GenerateDockerfile(test.path)
+			if err != nil {
+				t.Errorf("unexpected error: %v", err)
+			}
+
+			for _, line := range test.expected {
+				found := false
+				lines := strings.Split(string(dockerfile), "\n")
+
+				for _, l := range lines {
+					switch v := line.(type) {
+					case string:
+						if strings.Contains(l, v) {
+							found = true
+							break
+						}
+					case *regexp.Regexp:
+						if v.MatchString(l) {
+							found = true
+							break
+						}
+					}
+				}
+
+				if !found {
+					t.Errorf("expected %v, not found in %v", line, string(dockerfile))
+				}
+			}
+		})
+	}
+}

testdata/php-composer/composer.json

@@ -0,0 +1,7 @@
+{
+  "name": "test/test",
+  "description": "Test",
+  "require": {
+    "php": ">=5.3.0"
+  }
+}

testdata/php-npm/.tool-versions

@@ -0,0 +1 @@
+php 8.2.0

testdata/php-npm/package.json

@@ -0,0 +1,5 @@
+{
+  "scripts": {
+    "build": "echo 'Building the project...'"
+  }
+}