Make php generated code conform to PSR-4. (#2435)

1. Generate single file for each message.
2. Lazily initiate metadata.

1 files changed, 82 insertions, 52 deletions

diff --git a/Makefile.am b/Makefile.am
index bea48ca3..4ece5217 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -575,58 +575,88 @@ objectivec_EXTRA_DIST=                                                       \
   objectivec/Tests/UnitTests-Info.plist                                       \
   Protobuf.podspec
 
-php_EXTRA_DIST=                                              \
-  php/src/phpdoc.dist.xml                                    \
-  php/src/Google/Protobuf/Internal/DescriptorPool.php        \
-  php/src/Google/Protobuf/Internal/OneofField.php            \
-  php/src/Google/Protobuf/Internal/MapEntry.php              \
-  php/src/Google/Protobuf/Internal/InputStream.php           \
-  php/src/Google/Protobuf/Internal/OutputStream.php          \
-  php/src/Google/Protobuf/Internal/MessageBuilderContext.php \
-  php/src/Google/Protobuf/Internal/MapField.php              \
-  php/src/Google/Protobuf/Internal/RepeatedField.php         \
-  php/src/Google/Protobuf/Internal/Message.php               \
-  php/src/Google/Protobuf/Internal/GPBWire.php               \
-  php/src/Google/Protobuf/Internal/GPBType.php               \
-  php/src/Google/Protobuf/Internal/GPBLabel.php              \
-  php/src/Google/Protobuf/Internal/EnumBuilderContext.php    \
-  php/src/Google/Protobuf/Internal/GPBUtil.php               \
-  php/src/Google/Protobuf/descriptor_internal.pb.php         \
-  php/src/Google/Protobuf/descriptor.php                     \
-  php/tests/encode_decode_test.php                           \
-  php/tests/test.sh                                          \
-  php/tests/generated_class_test.php                         \
-  php/tests/array_test.php                                   \
-  php/tests/php_implementation_test.php                      \
-  php/tests/test_include.proto                               \
-  php/tests/test_include.pb.php                              \
-  php/tests/map_field_test.php                               \
-  php/tests/test_base.php                                    \
-  php/tests/test_no_namespace.proto                          \
-  php/tests/test_no_namespace.pb.php                         \
-  php/tests/test_util.php                                    \
-  php/tests/test.proto                                       \
-  php/tests/test.pb.php                                      \
-  php/tests/memory_leak_test.php                             \
-  php/tests/google/protobuf/empty.pb.php                     \
-  php/tests/well_known_test.php                              \
-  php/README.md                                              \
-  php/ext/google/protobuf/utf8.h                             \
-  php/ext/google/protobuf/message.c                          \
-  php/ext/google/protobuf/utf8.c                             \
-  php/ext/google/protobuf/package.xml                        \
-  php/ext/google/protobuf/upb.h                              \
-  php/ext/google/protobuf/array.c                            \
-  php/ext/google/protobuf/encode_decode.c                    \
-  php/ext/google/protobuf/protobuf.h                         \
-  php/ext/google/protobuf/type_check.c                       \
-  php/ext/google/protobuf/def.c                              \
-  php/ext/google/protobuf/storage.c                          \
-  php/ext/google/protobuf/map.c                              \
-  php/ext/google/protobuf/config.m4                          \
-  php/ext/google/protobuf/upb.c                              \
-  php/ext/google/protobuf/protobuf.c                         \
-  phpunit.xml                                                \
+php_EXTRA_DIST=                                                       \
+  php/src/phpdoc.dist.xml                                             \
+  php/src/Google/Protobuf/Internal/DescriptorPool.php                 \
+  php/src/Google/Protobuf/Internal/GeneratedCodeInfo.php              \
+  php/src/Google/Protobuf/Internal/OneofField.php                     \
+  php/src/Google/Protobuf/Internal/MessageOptions.php                 \
+  php/src/Google/Protobuf/Internal/FileDescriptorProto.php            \
+  php/src/Google/Protobuf/Internal/MapEntry.php                       \
+  php/src/Google/Protobuf/Internal/FieldDescriptorProto.php           \
+  php/src/Google/Protobuf/Internal/InputStream.php                    \
+  php/src/Google/Protobuf/Internal/UninterpretedOption.php            \
+  php/src/Google/Protobuf/Internal/ServiceOptions.php                 \
+  php/src/Google/Protobuf/Internal/MethodOptions_IdempotencyLevel.php \
+  php/src/Google/Protobuf/Internal/ServiceDescriptorProto.php         \
+  php/src/Google/Protobuf/Internal/OneofDescriptorProto.php           \
+  php/src/Google/Protobuf/Internal/UninterpretedOption_NamePart.php   \
+  php/src/Google/Protobuf/Internal/OutputStream.php                   \
+  php/src/Google/Protobuf/Internal/MessageBuilderContext.php          \
+  php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php       \
+  php/src/Google/Protobuf/Internal/FileOptions_OptimizeMode.php       \
+  php/src/Google/Protobuf/Internal/DescriptorProto.php                \
+  php/src/Google/Protobuf/Internal/MapField.php                       \
+  php/src/Google/Protobuf/Internal/MethodDescriptorProto.php          \
+  php/src/Google/Protobuf/Internal/DescriptorProto_ExtensionRange.php \
+  php/src/Google/Protobuf/Internal/DescriptorProto_ReservedRange.php  \
+  php/src/Google/Protobuf/Internal/RepeatedField.php                  \
+  php/src/Google/Protobuf/Internal/EnumValueOptions.php               \
+  php/src/Google/Protobuf/Internal/MethodOptions.php                  \
+  php/src/Google/Protobuf/Internal/OneofOptions.php                   \
+  php/src/Google/Protobuf/Internal/Message.php                        \
+  php/src/Google/Protobuf/Internal/FileOptions.php                    \
+  php/src/Google/Protobuf/Internal/FileDescriptorSet.php              \
+  php/src/Google/Protobuf/Internal/EnumDescriptorProto.php            \
+  php/src/Google/Protobuf/Internal/GPBWire.php                        \
+  php/src/Google/Protobuf/Internal/FieldDescriptorProto_Label.php     \
+  php/src/Google/Protobuf/Internal/FieldOptions.php                   \
+  php/src/Google/Protobuf/Internal/GeneratedCodeInfo_Annotation.php   \
+  php/src/Google/Protobuf/Internal/FieldDescriptorProto_Type.php      \
+  php/src/Google/Protobuf/Internal/GPBType.php                        \
+  php/src/Google/Protobuf/Internal/FieldOptions_JSType.php            \
+  php/src/Google/Protobuf/Internal/SourceCodeInfo_Location.php        \
+  php/src/Google/Protobuf/Internal/SourceCodeInfo.php                 \
+  php/src/Google/Protobuf/Internal/EnumOptions.php                    \
+  php/src/Google/Protobuf/Internal/GPBLabel.php                       \
+  php/src/Google/Protobuf/Internal/EnumBuilderContext.php             \
+  php/src/Google/Protobuf/Internal/GPBUtil.php                        \
+  php/src/Google/Protobuf/Internal/FieldOptions_CType.php             \
+  php/src/Google/Protobuf/descriptor.php                              \
+  php/src/GPBMetadata/Google/Protobuf/Internal/Descriptor.php         \
+  php/tests/autoload.php                                              \
+  php/tests/encode_decode_test.php                                    \
+  php/tests/test.sh                                                   \
+  php/tests/gdb_test.sh                                               \
+  php/tests/generated_class_test.php                                  \
+  php/tests/array_test.php                                            \
+  php/tests/php_implementation_test.php                               \
+  php/tests/proto/test_include.proto                                  \
+  php/tests/map_field_test.php                                        \
+  php/tests/test_base.php                                             \
+  php/tests/proto/test_no_namespace.proto                             \
+  php/tests/test_util.php                                             \
+  php/tests/proto/test.proto                                          \
+  php/tests/memory_leak_test.php                                      \
+  php/tests/well_known_test.php                                       \
+  php/README.md                                                       \
+  php/ext/google/protobuf/utf8.h                                      \
+  php/ext/google/protobuf/message.c                                   \
+  php/ext/google/protobuf/utf8.c                                      \
+  php/ext/google/protobuf/package.xml                                 \
+  php/ext/google/protobuf/upb.h                                       \
+  php/ext/google/protobuf/array.c                                     \
+  php/ext/google/protobuf/encode_decode.c                             \
+  php/ext/google/protobuf/protobuf.h                                  \
+  php/ext/google/protobuf/type_check.c                                \
+  php/ext/google/protobuf/def.c                                       \
+  php/ext/google/protobuf/storage.c                                   \
+  php/ext/google/protobuf/map.c                                       \
+  php/ext/google/protobuf/config.m4                                   \
+  php/ext/google/protobuf/upb.c                                       \
+  php/ext/google/protobuf/protobuf.c                                  \
+  php/phpunit.xml                                                     \
+  php/composer.json                                                   \
   composer.json
 
 python_EXTRA_DIST=                                                           \