Fix service NAME

roadrunner-server · May 12, 2024 · 7b4aa55 · 7b4aa55
1 parent 47dba0c
commit 7b4aa55
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/protoc_plugins/protoc-gen-php-grpc/php/template.go b/protoc_plugins/protoc-gen-php-grpc/php/template.go
@@ -44,7 +44,7 @@ use Spiral\RoadRunner\GRPC;
 interface {{ .Service.Name | interface }} extends GRPC\ServiceInterface
 {
     // GRPC specific service name.
-    public const NAME = "{{ .File.Package }}.{{ .Service.Name }}";{{ "\n" }}
+    public const NAME = "{{ resolve_name_const .File.Package .Service.Name }}";{{ "\n" }}
 {{- range $m := .Service.Method}}
 {{- $inName := name $ns $m.InputType }}
 {{- $outName := name $ns $m.OutputType }}
@@ -94,6 +94,15 @@ func body(req *plugin.CodeGeneratorRequest, file *desc.FileDescriptorProto, serv
 		"strip_slashes": func(name string) string {
 			return strings.ReplaceAll(name, "\\\\", "\\")
 		},
+		"resolve_name_const": func(packagePath, serviceName *string) string {
+
+			if packagePath == nil || *packagePath == "" {
+				return *serviceName
+			}
+
+			return *packagePath + "." + *serviceName
+
+		},
 	}).Parse(phpBody))
 
 	err := tpl.Execute(out, data)

diff --git a/protoc_plugins/protoc_test.go b/protoc_plugins/protoc_test.go
@@ -34,7 +34,8 @@ func protoc(t *testing.T, args []string) {
 }
 
 func Test_Simple(t *testing.T) {
-	workdir, _ := os.Getwd()
+	workdir, err := os.Getwd()
+	require.NoError(t, err)
 	tmpdir, err := os.MkdirTemp("", "proto-test")
 	require.NoError(t, err)
 
@@ -61,7 +62,8 @@ func Test_Simple(t *testing.T) {
 }
 
 func Test_PhpNamespaceOption(t *testing.T) {
-	workdir, _ := os.Getwd()
+	workdir, err := os.Getwd()
+	require.NoError(t, err)
 	tmpdir, err := os.MkdirTemp("", "proto-test")
 	require.NoError(t, err)
 
@@ -87,7 +89,8 @@ func Test_PhpNamespaceOption(t *testing.T) {
 }
 
 func Test_UseImportedMessage(t *testing.T) {
-	workdir, _ := os.Getwd()
+	workdir, err := os.Getwd()
+	require.NoError(t, err)
 	tmpdir, err := os.MkdirTemp("", "proto-test")
 	require.NoError(t, err)
 
@@ -113,7 +116,8 @@ func Test_UseImportedMessage(t *testing.T) {
 }
 
 func Test_PhpNamespaceOptionInUse(t *testing.T) {
-	workdir, _ := os.Getwd()
+	workdir, err := os.Getwd()
+	require.NoError(t, err)
 	tmpdir, err := os.MkdirTemp("", "proto-test")
 	require.NoError(t, err)
 
@@ -139,7 +143,8 @@ func Test_PhpNamespaceOptionInUse(t *testing.T) {
 }
 
 func Test_UseOfGoogleEmptyMessage(t *testing.T) {
-	workdir, _ := os.Getwd()
+	workdir, err := os.Getwd()
+	require.NoError(t, err)
 	tmpdir, err := os.MkdirTemp("", "proto-test")
 	require.NoError(t, err)
 
@@ -166,7 +171,8 @@ func Test_UseOfGoogleEmptyMessage(t *testing.T) {
 }
 
 func Test_NoPackage(t *testing.T) {
-	workdir, _ := os.Getwd()
+	workdir, err := os.Getwd()
+	require.NoError(t, err)
 	tmpdir, err := os.MkdirTemp("", "proto-test")
 	require.NoError(t, err)
 

diff --git a/protoc_plugins/testdata/NoPackage/Test/CustomImport/ServiceInterface.php b/protoc_plugins/testdata/NoPackage/Test/CustomImport/ServiceInterface.php
@@ -9,7 +9,7 @@
 interface ServiceInterface extends GRPC\ServiceInterface
 {
     // GRPC specific service name.
-    public const NAME = "<nil>.Service";
+    public const NAME = "Service";
 
     /**
     * @param GRPC\ContextInterface $ctx