diff options
| author | Colin Cross <ccross@android.com> | 2019-08-13 18:26:41 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-08-24 14:09:43 -0700 |
| commit | 86b2128317bf27f964e1ed7396bfba1d00c2f6c9 (patch) | |
| tree | e36cd8f11ed469ce2f02f515df5cd4862e494a4d /composer.json | |
| parent | f2d938171b98af445e6525930ac3528c80663dbd (diff) | |
| download | protobuf-86b2128317bf27f964e1ed7396bfba1d00c2f6c9.tar.gz | |
Re-apply merge of tag v3.5.2
v3.5.2 was previously merged in Ia1b9174f7e3ac5c2d86ea7370d5c6c3ef1a37300
and then reverted as part of Ia04c0b15ebd45e8c7e02edaa6e1f10aeb11ef337,
which leaves v3.5.2 in the history but v3.0.0-beta3 in the tree. Reapply
the merge to v3.5.2 so that v3.9.1 can be merged on top of it.
Bug: 117607748
Test: m checkbuild
Change-Id: I77a2c0638b00487d3acfbf3c0d634f26caf5b9be
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/composer.json b/composer.json new file mode 100644 index 000000000..2c64ad220 --- /dev/null +++ b/composer.json @@ -0,0 +1,23 @@ +{ + "name": "google/protobuf", + "type": "library", + "description": "proto library for PHP", + "keywords": ["proto"], + "homepage": "https://developers.google.com/protocol-buffers/", + "license": "BSD-3-Clause", + "require": { + "php": ">=5.5.0" + }, + "require-dev": { + "phpunit/phpunit": ">=4.8.0" + }, + "suggest": { + "ext-bcmath": "Need to support JSON deserialization" + }, + "autoload": { + "psr-4": { + "Google\\Protobuf\\": "php/src/Google/Protobuf", + "GPBMetadata\\Google\\Protobuf\\": "php/src/GPBMetadata/Google/Protobuf" + } + } +} |