Fix proto_path params order (#106)

* Update ProtocCommandBuilder.php * Fix test case
spiral · Aug 2, 2024 · f86982f · f86982f
1 parent 3bdc13c
commit f86982f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/GRPC/ProtocCommandBuilder.php b/src/GRPC/ProtocCommandBuilder.php
@@ -45,8 +45,9 @@ private function getProtoFiles(string $protoDir): array
     private function buildDirs(string $protoDir): string
     {
         $dirs = \array_filter([
-            $this->config->getServicesBasePath(),
+            // The current directory must be first in the import path list to avoid proto-file name conflicts.
             $protoDir,
+            $this->config->getServicesBasePath(),
         ]);
 
         if ($dirs === []) {

diff --git a/tests/src/GRPC/ProtocCommandBuilderTest.php b/tests/src/GRPC/ProtocCommandBuilderTest.php
@@ -39,7 +39,7 @@ public function testBuild(): void
             ]);
 
         $this->assertSame(
-            "protoc --plugin=path3 --php_out='path2' --php-grpc_out='path2' -I='path4' -I='path1' 'message.proto' 'service.proto' 2>&1",
+            "protoc --plugin=path3 --php_out='path2' --php-grpc_out='path2' -I='path1' -I='path4' 'message.proto' 'service.proto' 2>&1",
             $builder->build('path1', 'path2')
         );
     }