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

This commit is contained in:
Alexandre Daubois
2025-07-07 05:55:09 +02:00
committed by GitHub
parent 1ba19ae09e
commit 6ce99f251a
12 changed files with 25 additions and 25 deletions

View File

@@ -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)
}

View File

@@ -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) {

View File

@@ -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 {

View File

@@ -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) {

View File

@@ -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) {

View File

@@ -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")

View File

@@ -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) {

View File

@@ -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")

View File

@@ -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) {

View File

@@ -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)

View File

@@ -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

View File

@@ -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")
})
}