chore(extgen): unexport more symbols (#1719)

alexandre-daubois · web-flow · commit 6ce99f251ab5 · 2025-07-07T05:55:09.000+02:00
diff --git a/internal/extgen/arginfo.go b/internal/extgen/arginfo.go
@@ -36,7 +36,7 @@ func (ag *arginfoGenerator) fixArginfoFile(stubFile string) error {
 	arginfoFile := strings.TrimSuffix(stubFile, ".stub.php") + "_arginfo.h"
 	arginfoPath := filepath.Join(ag.generator.BuildDir, arginfoFile)
 
-	content, err := ReadFile(arginfoPath)
+	content, err := readFile(arginfoPath)
 	if err != nil {
 		return fmt.Errorf("reading arginfo file: %w", err)
 	}
@@ -46,5 +46,5 @@ func (ag *arginfoGenerator) fixArginfoFile(stubFile string) error {
 		"zend_register_internal_class_with_flags(&ce, NULL, 0)",
 		"zend_register_internal_class(&ce)")
 
-	return WriteFile(arginfoPath, fixedContent)
+	return writeFile(arginfoPath, fixedContent)
 }
diff --git a/internal/extgen/cfile.go b/internal/extgen/cfile.go
@@ -31,7 +31,7 @@ func (cg *cFileGenerator) generate() error {
 		return err
 	}
 
-	return WriteFile(filename, content)
+	return writeFile(filename, content)
 }
 
 func (cg *cFileGenerator) buildContent() (string, error) {
diff --git a/internal/extgen/cfile_test.go b/internal/extgen/cfile_test.go
@@ -51,7 +51,7 @@ func TestCFileGenerator_Generate(t *testing.T) {
 	expectedFile := filepath.Join(tmpDir, "test_extension.c")
 	require.FileExists(t, expectedFile, "Expected C file was not created: %s", expectedFile)
 
-	content, err := ReadFile(expectedFile)
+	content, err := readFile(expectedFile)
 	require.NoError(t, err)
 
 	testCFileBasicStructure(t, content, "test_extension")
@@ -258,7 +258,7 @@ func TestCFileIntegrationWithGenerators(t *testing.T) {
 	cGen := cFileGenerator{generator}
 	require.NoError(t, cGen.generate())
 
-	content, err := ReadFile(filepath.Join(tmpDir, "integration_test.c"))
+	content, err := readFile(filepath.Join(tmpDir, "integration_test.c"))
 	require.NoError(t, err)
 
 	for _, fn := range functions {
diff --git a/internal/extgen/docs.go b/internal/extgen/docs.go
@@ -27,7 +27,7 @@ func (dg *DocumentationGenerator) generate() error {
 		return err
 	}
 
-	return WriteFile(filename, content)
+	return writeFile(filename, content)
 }
 
 func (dg *DocumentationGenerator) generateMarkdown() (string, error) {
diff --git a/internal/extgen/gofile.go b/internal/extgen/gofile.go
@@ -35,7 +35,7 @@ func (gg *GoFileGenerator) generate() error {
 		return fmt.Errorf("building Go file content: %w", err)
 	}
 
-	return WriteFile(filename, content)
+	return writeFile(filename, content)
 }
 
 func (gg *GoFileGenerator) buildContent() (string, error) {
diff --git a/internal/extgen/gofile_test.go b/internal/extgen/gofile_test.go
@@ -72,7 +72,7 @@ func anotherHelper() {
 	expectedFile := filepath.Join(tmpDir, "test.go")
 	require.FileExists(t, expectedFile)
 
-	content, err := ReadFile(expectedFile)
+	content, err := readFile(expectedFile)
 	require.NoError(t, err)
 
 	testGoFileBasicStructure(t, content, "test")
diff --git a/internal/extgen/hfile.go b/internal/extgen/hfile.go
@@ -29,7 +29,7 @@ func (hg *HeaderGenerator) generate() error {
 		return err
 	}
 
-	return WriteFile(filename, content)
+	return writeFile(filename, content)
 }
 
 func (hg *HeaderGenerator) buildContent() (string, error) {
diff --git a/internal/extgen/hfile_test.go b/internal/extgen/hfile_test.go
@@ -23,7 +23,7 @@ func TestHeaderGenerator_Generate(t *testing.T) {
 	expectedFile := filepath.Join(tmpDir, "test_extension.h")
 	require.FileExists(t, expectedFile)
 
-	content, err := ReadFile(expectedFile)
+	content, err := readFile(expectedFile)
 	require.NoError(t, err)
 
 	testHeaderBasicStructure(t, content, "test_extension")
diff --git a/internal/extgen/stub.go b/internal/extgen/stub.go
@@ -21,7 +21,7 @@ func (sg *StubGenerator) generate() error {
 		return err
 	}
 
-	return WriteFile(filename, content)
+	return writeFile(filename, content)
 }
 
 func (sg *StubGenerator) buildContent() (string, error) {
diff --git a/internal/extgen/stub_test.go b/internal/extgen/stub_test.go
@@ -60,7 +60,7 @@ func TestStubGenerator_Generate(t *testing.T) {
 	expectedFile := filepath.Join(tmpDir, "test_extension.stub.php")
 	assert.FileExists(t, expectedFile, "Expected stub file was not created: %s", expectedFile)
 
-	content, err := ReadFile(expectedFile)
+	content, err := readFile(expectedFile)
 	assert.NoError(t, err, "Failed to read generated stub file")
 
 	testStubBasicStructure(t, content)
diff --git a/internal/extgen/utils.go b/internal/extgen/utils.go
@@ -6,11 +6,11 @@ import (
 	"unicode"
 )
 
-func WriteFile(filename, content string) error {
+func writeFile(filename, content string) error {
 	return os.WriteFile(filename, []byte(content), 0644)
 }
 
-func ReadFile(filename string) (string, error) {
+func readFile(filename string) (string, error) {
 	content, err := os.ReadFile(filename)
 	if err != nil {
 		return "", err
diff --git a/internal/extgen/utils_test.go b/internal/extgen/utils_test.go
@@ -51,24 +51,24 @@ func TestWriteFile(t *testing.T) {
 				filename = tt.filename
 			}
 
-			err := WriteFile(filename, tt.content)
+			err := writeFile(filename, tt.content)
 
 			if tt.expectError {
-				assert.Error(t, err, "WriteFile() should return an error")
+				assert.Error(t, err, "writeFile() should return an error")
 				return
 			}
 
-			assert.NoError(t, err, "WriteFile() should not return an error")
+			assert.NoError(t, err, "writeFile() should not return an error")
 
 			content, err := os.ReadFile(filename)
 			assert.NoError(t, err, "Failed to read written file")
-			assert.Equal(t, tt.content, string(content), "WriteFile() content mismatch")
+			assert.Equal(t, tt.content, string(content), "writeFile() content mismatch")
 
 			info, err := os.Stat(filename)
 			assert.NoError(t, err, "Failed to stat file")
 
 			expectedMode := os.FileMode(0644)
-			assert.Equal(t, expectedMode, info.Mode().Perm(), "WriteFile() wrong permissions")
+			assert.Equal(t, expectedMode, info.Mode().Perm(), "writeFile() wrong permissions")
 		})
 	}
 }
@@ -104,21 +104,21 @@ func TestReadFile(t *testing.T) {
 			err := os.WriteFile(filename, []byte(tt.content), 0644)
 			assert.NoError(t, err, "Failed to create test file")
 
-			content, err := ReadFile(filename)
+			content, err := readFile(filename)
 
 			if tt.expectError {
-				assert.Error(t, err, "ReadFile() should return an error")
+				assert.Error(t, err, "readFile() should return an error")
 				return
 			}
 
-			assert.NoError(t, err, "ReadFile() should not return an error")
-			assert.Equal(t, tt.content, content, "ReadFile() content mismatch")
+			assert.NoError(t, err, "readFile() should not return an error")
+			assert.Equal(t, tt.content, content, "readFile() content mismatch")
 		})
 	}
 
 	t.Run("read nonexistent file", func(t *testing.T) {
-		_, err := ReadFile("/nonexistent/file.txt")
-		assert.Error(t, err, "ReadFile() should return an error for nonexistent file")
+		_, err := readFile("/nonexistent/file.txt")
+		assert.Error(t, err, "readFile() should return an error for nonexistent file")
 	})
 }
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func (ag *arginfoGenerator) fixArginfoFile(stubFile string) error {`
`36`	`36`	`arginfoFile := strings.TrimSuffix(stubFile, ".stub.php") + "_arginfo.h"`
`37`	`37`	`arginfoPath := filepath.Join(ag.generator.BuildDir, arginfoFile)`
`38`	`38`
`39`		`- content, err := ReadFile(arginfoPath)`
	`39`	`+ content, err := readFile(arginfoPath)`
`40`	`40`	`if err != nil {`
`41`	`41`	`return fmt.Errorf("reading arginfo file: %w", err)`
`42`	`42`	`}`
`@@ -46,5 +46,5 @@ func (ag *arginfoGenerator) fixArginfoFile(stubFile string) error {`
`46`	`46`	`"zend_register_internal_class_with_flags(&ce, NULL, 0)",`
`47`	`47`	`"zend_register_internal_class(&ce)")`
`48`	`48`
`49`		`- return WriteFile(arginfoPath, fixedContent)`
	`49`	`+ return writeFile(arginfoPath, fixedContent)`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ func (cg *cFileGenerator) generate() error {`
`31`	`31`	`return err`
`32`	`32`	`}`
`33`	`33`
`34`		`- return WriteFile(filename, content)`
	`34`	`+ return writeFile(filename, content)`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`func (cg *cFileGenerator) buildContent() (string, error) {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func (dg *DocumentationGenerator) generate() error {`
`27`	`27`	`return err`
`28`	`28`	`}`
`29`	`29`
`30`		`- return WriteFile(filename, content)`
	`30`	`+ return writeFile(filename, content)`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`func (dg *DocumentationGenerator) generateMarkdown() (string, error) {`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func (gg *GoFileGenerator) generate() error {`
`35`	`35`	`return fmt.Errorf("building Go file content: %w", err)`
`36`	`36`	`}`
`37`	`37`
`38`		`- return WriteFile(filename, content)`
	`38`	`+ return writeFile(filename, content)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`func (gg *GoFileGenerator) buildContent() (string, error) {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func (hg *HeaderGenerator) generate() error {`
`29`	`29`	`return err`
`30`	`30`	`}`
`31`	`31`
`32`		`- return WriteFile(filename, content)`
	`32`	`+ return writeFile(filename, content)`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func (hg *HeaderGenerator) buildContent() (string, error) {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ func (sg *StubGenerator) generate() error {`
`21`	`21`	`return err`
`22`	`22`	`}`
`23`	`23`
`24`		`- return WriteFile(filename, content)`
	`24`	`+ return writeFile(filename, content)`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`func (sg *StubGenerator) buildContent() (string, error) {`