simplify tests and code

Author: dunglas

go.mod

@@ -5,6 +5,7 @@ go 1.24.0
 retract v1.0.0-rc.1 // Human error
 
 require (
+	github.com/Masterminds/sprig/v3 v3.3.0
 	github.com/maypok86/otter v1.2.4
 	github.com/prometheus/client_golang v1.22.0
 	github.com/stretchr/testify v1.10.0
@@ -14,19 +15,29 @@ require (
 )
 
 require (
+	dario.cat/mergo v1.0.1 // indirect
+	github.com/Masterminds/goutils v1.1.1 // indirect
+	github.com/Masterminds/semver/v3 v3.3.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dolthub/maphash v0.1.0 // indirect
 	github.com/gammazero/deque v1.0.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.64.0 // indirect
 	github.com/prometheus/procfs v0.16.1 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
+	github.com/shopspring/decimal v1.4.0 // indirect
+	github.com/spf13/cast v1.7.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/crypto v0.39.0 // indirect
 	golang.org/x/sys v0.33.0 // indirect
 	golang.org/x/text v0.26.0 // indirect
 	google.golang.org/protobuf v1.36.6 // indirect

go.sum

@@ -1,3 +1,11 @@
+dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
+dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
+github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
+github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0=
+github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
+github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs=
+github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
@@ -6,10 +14,16 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dolthub/maphash v0.1.0 h1:bsQ7JsF4FkkWyrP3oCnFJgrCUAFbFf3kOl4L/QxPDyQ=
 github.com/dolthub/maphash v0.1.0/go.mod h1:gkg4Ch4CdCDu5h6PMriVLawB7koZ+5ijb9puGMV50a4=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/gammazero/deque v1.0.0 h1:LTmimT8H7bXkkCy6gZX7zNLtkbz4NdS2z8LZuor3j34=
 github.com/gammazero/deque v1.0.0/go.mod h1:iflpYvtGfM3U8S8j+sZEKIak3SAKYpA5/SQewgfXDKo=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=
+github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -18,6 +32,10 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/maypok86/otter v1.2.4 h1:HhW1Pq6VdJkmWwcZZq19BlEQkHtI8xgsQzBVXJU0nfc=
 github.com/maypok86/otter v1.2.4/go.mod h1:mKLfoI7v1HOmQMwFgX4QkRk23mX6ge3RDvjdHOWG4R4=
+github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
+github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
+github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
+github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -32,6 +50,10 @@ github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzM
 github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
+github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
+github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w=
+github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
@@ -42,6 +64,8 @@ go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 go.uber.org/zap/exp v0.3.0 h1:6JYzdifzYkGmTdRR59oYH+Ng7k49H9qVpWwNSsGJj3U=
 go.uber.org/zap/exp v0.3.0/go.mod h1:5I384qq7XGxYyByIhHm6jg5CHkGY0nsTfbDLgDDlgJQ=
+golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
+golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
 golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
 golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
 golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=

internal/extgen/cfile.go

@@ -1,6 +1,8 @@
 package extgen
 
 import (
+	"github.com/Masterminds/sprig/v3"
+
 	"bytes"
 	_ "embed"
 	"path/filepath"
@@ -20,7 +22,6 @@ type cTemplateData struct {
 	Functions []phpFunction
 	Classes   []phpClass
 	Constants []phpConstant
-	Version   string
 }
 
 func (cg *cFileGenerator) generate() error {
@@ -29,6 +30,7 @@ func (cg *cFileGenerator) generate() error {
 	if err != nil {
 		return err
 	}
+
 	return WriteFile(filename, content)
 }
 
@@ -50,27 +52,15 @@ func (cg *cFileGenerator) buildContent() (string, error) {
 }
 
 func (cg *cFileGenerator) getTemplateContent() (string, error) {
-	tmpl, err := template.New("cfile").Funcs(template.FuncMap{
-		"inc": func(i int) int {
-			return i + 1
-		},
-	}).Parse(cFileContent)
-
-	if err != nil {
-		return "", err
-	}
+	tmpl := template.Must(template.New("cfile").Funcs(sprig.FuncMap()).Parse(cFileContent))
 
-	data := cTemplateData{
+	var buf bytes.Buffer
+	if err := tmpl.Execute(&buf, cTemplateData{
 		BaseName:  cg.generator.BaseName,
 		Functions: cg.generator.Functions,
 		Classes:   cg.generator.Classes,
 		Constants: cg.generator.Constants,
-		Version:   "1.0.0",
-	}
-
-	var buf bytes.Buffer
-	err = tmpl.Execute(&buf, data)
-	if err != nil {
+	}); err != nil {
 		return "", err
 	}
 

internal/extgen/cfile_test.go

@@ -2,7 +2,6 @@ package extgen
 
 import (
 	"github.com/stretchr/testify/require"
-	"os"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -11,11 +10,7 @@ import (
 )
 
 func TestCFileGenerator_Generate(t *testing.T) {
-	tmpDir, err := os.MkdirTemp("", "c_file_generator_test")
-	require.NoError(t, err)
-	t.Cleanup(func() {
-		os.RemoveAll(tmpDir)
-	})
+	tmpDir := t.TempDir()
 
 	generator := &Generator{
 		BaseName: "test_extension",
@@ -54,8 +49,7 @@ func TestCFileGenerator_Generate(t *testing.T) {
 	require.NoError(t, cGen.generate())
 
 	expectedFile := filepath.Join(tmpDir, "test_extension.c")
-	_, err = os.Stat(expectedFile)
-	assert.False(t, os.IsNotExist(err), "Expected C file was not created: %s", expectedFile)
+	require.FileExists(t, expectedFile, "Expected C file was not created: %s", expectedFile)
 
 	content, err := ReadFile(expectedFile)
 	require.NoError(t, err)
@@ -141,9 +135,7 @@ func TestCFileGenerator_BuildContent(t *testing.T) {
 
 			cGen := cFileGenerator{generator}
 			content, err := cGen.buildContent()
-			if err != nil {
-				t.Fatalf("buildContent() failed: %v", err)
-			}
+			require.NoError(t, err)
 
 			for _, expected := range tt.contains {
 				assert.Contains(t, content, expected, "Generated C content should contain '%s'", expected)
@@ -212,12 +204,7 @@ func TestCFileGenerator_GetTemplateContent(t *testing.T) {
 }
 
 func TestCFileIntegrationWithGenerators(t *testing.T) {
-	tmpDir, err := os.MkdirTemp("", "c_integration_test")
-	require.NoError(t, err)
-
-	t.Cleanup(func() {
-		os.RemoveAll(tmpDir)
-	})
+	tmpDir := t.TempDir()
 
 	functions := []phpFunction{
 		{
@@ -324,9 +311,7 @@ func TestCFileSpecialCharacters(t *testing.T) {
 
 			cGen := cFileGenerator{generator}
 			content, err := cGen.buildContent()
-			if err != nil {
-				t.Fatalf("buildContent() failed: %v", err)
-			}
+			require.NoError(t, err)
 
 			expectedInclude := "#include \"" + tt.expected + ".h\""
 			assert.Contains(t, content, expectedInclude, "Content should contain include: %s", expectedInclude)
@@ -434,7 +419,7 @@ func TestCFileConstants(t *testing.T) {
 				},
 				{
 					Name:    "GLOBAL_STRING",
-					Value:   "\"test\"",
+					Value:   `"test"`,
 					PhpType: "string",
 				},
 			},
@@ -455,9 +440,7 @@ func TestCFileConstants(t *testing.T) {
 
 			cGen := cFileGenerator{generator}
 			content, err := cGen.buildContent()
-			if err != nil {
-				t.Fatalf("buildContent() failed: %v", err)
-			}
+			require.NoError(t, err)
 
 			for _, expected := range tt.contains {
 				assert.Contains(t, content, expected, "Generated C content should contain '%s'", expected)

internal/extgen/classparser.go

@@ -27,14 +27,13 @@ func (cp *classParser) Parse(filename string) ([]phpClass, error) {
 	return cp.parse(filename)
 }
 
-func (cp *classParser) parse(filename string) ([]phpClass, error) {
+func (cp *classParser) parse(filename string) (classes []phpClass, err error) {
 	fset := token.NewFileSet()
 	node, err := parser.ParseFile(fset, filename, nil, parser.ParseComments)
 	if err != nil {
 		return nil, fmt.Errorf("parsing file: %w", err)
 	}
 
-	var classes []phpClass
 	validator := Validator{}
 
 	exportDirectives := cp.collectExportDirectives(node, fset)
@@ -137,20 +136,6 @@ func (cp *classParser) extractPHPClassCommentWithLine(commentGroup *ast.CommentG
 	return "", 0
 }
 
-func (cp *classParser) extractPHPClassComment(commentGroup *ast.CommentGroup) string {
-	if commentGroup == nil {
-		return ""
-	}
-
-	for _, comment := range commentGroup.List {
-		if matches := phpClassRegex.FindStringSubmatch(comment.Text); matches != nil {
-			return matches[1]
-		}
-	}
-
-	return ""
-}
-
 func (cp *classParser) parseStructFields(fields []*ast.Field) []phpClassProperty {
 	var properties []phpClassProperty
 
@@ -177,6 +162,7 @@ func (cp *classParser) parseStructField(fieldName string, field *ast.Field) phpC
 	}
 
 	prop.PhpType = cp.goTypeToPHPType(prop.goType)
+
 	return prop
 }
 
@@ -217,14 +203,19 @@ func (cp *classParser) goTypeToPHPType(goType string) string {
 	return "mixed"
 }
 
-func (cp *classParser) parseMethods(filename string) ([]phpClassMethod, error) {
+func (cp *classParser) parseMethods(filename string) (methods []phpClassMethod, err error) {
 	file, err := os.Open(filename)
 	if err != nil {
 		return nil, err
 	}
-	defer file.Close()
 
-	var methods []phpClassMethod
+	defer func() {
+		e := file.Close()
+		if err != nil {
+			err = e
+		}
+	}()
+
 	scanner := bufio.NewScanner(file)
 	var currentMethod *phpClassMethod
 
@@ -239,7 +230,8 @@ func (cp *classParser) parseMethods(filename string) ([]phpClassMethod, error) {
 
 			method, err := cp.parseMethodSignature(className, signature)
 			if err != nil {
-				fmt.Printf("Warning: Error parsing method signature '%s': %v\n", signature, err)
+				fmt.Printf("Warning: Error parsing method signature %q: %v\n", signature, err)
+
 				continue
 			}
 
@@ -253,7 +245,8 @@ func (cp *classParser) parseMethods(filename string) ([]phpClassMethod, error) {
 			}
 
 			if err := validator.validateScalarTypes(phpFunc); err != nil {
-				fmt.Printf("Warning: Method '%s::%s' uses unsupported types: %v\n", className, method.Name, err)
+				fmt.Printf("Warning: Method \"%s::%s\" uses unsupported types: %v\n", className, method.Name, err)
+
 				continue
 			}
 
@@ -266,6 +259,7 @@ func (cp *classParser) parseMethods(filename string) ([]phpClassMethod, error) {
 			if err != nil {
 				return nil, fmt.Errorf("extracting Go method function: %w", err)
 			}
+
 			currentMethod.goFunction = goFunc
 
 			validator := Validator{}
@@ -318,6 +312,7 @@ func (cp *classParser) parseMethodSignature(className, signature string) (*phpCl
 			if err != nil {
 				return nil, fmt.Errorf("parsing parameter '%s': %w", part, err)
 			}
+
 			params = append(params, param)
 		}
 	}
@@ -366,7 +361,7 @@ func (cp *classParser) sanitizeDefaultValue(value string) string {
 		return "null"
 	}
 
-	return strings.Trim(value, "'\"")
+	return strings.Trim(value, `'"`)
 }
 
 func (cp *classParser) extractGoMethodFunction(scanner *bufio.Scanner, firstLine string) (string, error) {