fix(php): Remove public and weak dependencies from generated PHP.

Fixes issue #11146 caused by transitive dependencies referencing
removed dependencies in the emitted PHP metadata classes.

Author: alowde

src/google/protobuf/compiler/php/generator_unittest.cc

@@ -105,6 +105,38 @@ TEST_F(PhpGeneratorTest, ClosedEnumError) {
   ExpectErrorSubstring("Can't generate PHP code for closed enum Foo");
 }
 
+TEST_F(PhpGeneratorTest, ImportPublic) {
+  CreateTempFile("common.proto",
+                 R"schema(
+    syntax = "proto3";
+    package prototest;
+    message Common {
+      string data = 1;
+    })schema");
+
+  CreateTempFile("prototest.proto",
+                 R"schema(
+    syntax = "proto3";
+    package prototest;
+    import public "common.proto";
+    )schema");
+
+  CreateTempFile("usecase.proto",
+                 R"schema(
+    syntax = "proto3";
+    package usecasetest;
+    import "prototest.proto";
+    message UseCase {
+      prototest.Common commonUse = 1;
+    })schema");
+
+  RunProtoc(
+      "protocol_compiler --proto_path=$tmpdir --php_out=$tmpdir "
+      "common.proto prototest.proto usecase.proto");
+
+  ExpectNoErrors();
+}
+
 }  // namespace
 }  // namespace php
 }  // namespace compiler

src/google/protobuf/compiler/php/php_generator.cc

@@ -1047,6 +1047,12 @@ void GenerateAddFileToPool(const FileDescriptor* file, const Options& options,
         }
       }
 
+      // Clear public_dependency and weak_dependency since they contain indices
+      // into the dependency array which we just modified above. PHP handles
+      // dependency loading through initOnce() calls instead.
+      file_proto->clear_public_dependency();
+      file_proto->clear_weak_dependency();
+
       // Filter out all extensions, since we do not support extension yet.
       file_proto->clear_extension();
       RepeatedPtrField<DescriptorProto>* message_type =
@@ -1173,6 +1179,12 @@ void GenerateAddFilesToPool(const FileDescriptor* file, const Options& options,
         }
       }
 
+      // Clear public_dependency and weak_dependency since they contain indices
+      // into the dependency array which we just modified above. PHP handles
+      // dependency loading through initOnce() calls instead.
+      file_proto->clear_public_dependency();
+      file_proto->clear_weak_dependency();
+
       // Filter out all extensions, since we do not support extension yet.
       file_proto->clear_extension();
       RepeatedPtrField<DescriptorProto>* message_type =