aboutsummaryrefslogtreecommitdiff
path: root/php/src/Google/Protobuf/Internal/FieldDescriptorProto.php
Commit message (Expand)AuthorAgeFilesLines
* Merge master into 3.4.xJisi Liu2017-07-181-74/+85
|\
| * remove pass by reference for php setters (#3344)Brent Shaffer2017-07-171-1/+1
| * adds PHPDoc @return and @param for getters and setters respectively (#3131)Brent Shaffer2017-06-271-72/+64
| * Add new file option php_namespace. (#3162)Paul Yang2017-06-051-0/+20
|/
* Make php generated code conform to PSR-4. (#2435)Paul Yang2016-12-081-0/+424