Commit Graph

4692 Commits

Author SHA1 Message Date
Brent Shaffer
12acbc2678 adds PHPDoc @return and @param for getters and setters respectively (#3131)
* adds PHPDoc @return and @param for getters and setters respectively

* addresses changes in PR review

* adds documentation tests

* Update php_generator:

- Prepend \ to names where required
- Remove <pre> tags
- Update protobuf field comments

* Updates class files with the protobuf changes

* Addresses review comments

* removes Protobuf Type line from PHP generated classes

* fixes phpdoc test

* adds array types to phpdoc
2017-06-27 16:28:28 -07:00
Feng Xiao
097bfb53d1 Merge pull request #3084 from lukaszx0/patch-1
Workaround the docker bug when compiling artifacts
2017-06-26 10:48:22 -07:00
Paul Yang
dd7265e1a2 Merge pull request #3264 from TeBoring/php-bug
Enusre public header and generated code have no implicit converion.
2017-06-24 12:20:57 -07:00
Bo Yang
e3c807d4e7 Fix more implicit type conversions in public headers and generated code. 2017-06-24 11:28:13 -07:00
Feng Xiao
1a7e49d462 Merge pull request #2968 from ngg/cpp-proper-fwd
C++: Do not forward-declare dependencies in generated .h files
2017-06-23 15:08:04 -07:00
Bo Yang
9c0b35cf62 Enusre public header and generated code have no implicit converion. 2017-06-23 11:58:05 -07:00
Feng Xiao
f752d816b7 Merge pull request #3266 from mbrickn/patch-1
Updated links to use https
2017-06-23 10:39:42 -07:00
Maxwell Paul Brickner
d07efbad91 Updated links to use https
Howdy!

I just updated some links to use https instead of http.

Thanks! ^ _ ^
2017-06-23 09:25:03 -04:00
Thomas Van Lenten
eca0f4ee91 Merge pull request #3261 from thomasvl/super_oddcase
If we fail to get a descriptor just super the method resolving.
2017-06-22 10:34:10 -04:00
Thomas Van Lenten
db45687a38 If we fail to get a descriptor just super the method resolving.
This should never happen, but if someone is swizzling or do other
hooking of methods, anything is possible, so this seems slighty
safer than they returning NO.
2017-06-22 10:18:00 -04:00
Ryan Gordon
703cd8e11c Switch to addEnumType to fix fatal error (#3225)
* Switch to addEnumType to fix fatal error

* Fixing more cases of HHVM incompatibility

* Updating tests to be hhvm compatible

* Fixing tests

* Fixing merge

* Don't use call_user_func, should hopefully fix tests

* Fixing spelling

* Fixing another misspelling in a test

* Fixing placement of append and kvUpdate functions

* Actually fix function helpers

* Remove double addEnumType. How did this ever work?

* Fixing a couple more tests

* Only use the setter if the return value isn't an object
2017-06-19 18:15:49 -07:00
Joshua Haberman
1325588982 Updated upb to fix JSON conformance issues. (#3206)
* Fixed a bunch of Ruby conformance errors.

* Fixed some more Ruby conformance errors in JSON.
2017-06-19 15:13:24 -07:00
Feng Xiao
c2fdef05cf Merge pull request #3243 from yjjnls/master
replenish missed header files in install step
2017-06-19 11:18:45 -07:00
Thomas Van Lenten
73b7cc0007 Merge pull request #3244 from thomasvl/complete_docs
ObjC: Document the exceptions on some of the writing apis.
2017-06-19 10:34:25 -04:00
Thomas Van Lenten
5fd71ce631 ObjC: Document the exceptions on some of the writing apis. 2017-06-19 10:33:45 -04:00
Thomas Van Lenten
72e293a28f Merge pull request #3240 from thomasvl/float_fun
Raise the number of digits used for floats.
2017-06-19 08:23:37 -04:00
yjjnls
8f367c0b2d replenish missed header files in install step
install 'generated_message_table_driven.h' and 'metadata_lite.h', they are included when compiling the files generated using protoc.exe 3.3.0
2017-06-19 14:15:54 +08:00
Jeff Ching
5729cf77f6 Remove inclusion of ext/json/php_json.h. (#3241)
That implementation of json is not being used - this extension is using
a json encoder/decoder provided by 'upb'.
2017-06-17 11:01:16 -07:00
Thomas Van Lenten
dd19b876d4 Raise the number of digits used for floats.
About 1.5% of all IEEE754 single-precision numbers require nine
decimal digits to represent accurately.
2017-06-16 15:24:33 -04:00
Feng Xiao
710543d915 Merge pull request #3237 from calder/patch-1
Qualify string in java_options.h
2017-06-16 11:39:11 -07:00
Feng Xiao
491b32041d Merge pull request #3236 from buchgr/bazel-links
bazel: add bazel symlinks to .gitignore
2017-06-16 11:38:15 -07:00
Feng Xiao
888e287e3b Merge pull request #3235 from buchgr/java-target
bazel: Make compiled jars java 6 binary compatible.
2017-06-16 11:37:48 -07:00
Calder Coalson
4b36d4006b Qualify string in java_options.h
Building the protobuf compiler with Bazel fails to resolve the unqualifed "string"s in java_options.h:

```
ERROR: .../external/com_google_protobuf/BUILD:248:1: C++ compilation of rule '@com_google_protobuf//:protoc_lib' failed: Process exited with status 1 [sandboxed].
In file included from external/com_google_protobuf/src/google/protobuf/compiler/java/java_context.h:41:0,
                 from external/com_google_protobuf/src/google/protobuf/compiler/java/java_enum_field_lite.cc:38:
external/com_google_protobuf/src/google/protobuf/compiler/java/java_options.h:59:3: error: 'string' does not name a type
   string annotation_list_file;
   ^
external/com_google_protobuf/src/google/protobuf/compiler/java/java_options.h:62:3: error: 'string' does not name a type
   string output_list_file;
   ^
Use --strategy=CppCompile=standalone to disable sandboxing for the failing actions.
INFO: Elapsed time: 41.487s, Critical Path: 6.20s
//interpreter:eval_test                                               NO STATUS

Executed 0 out of 1 test: 1 was skipped.
```
2017-06-16 07:06:09 -07:00
Jakob Buchgraber
36e63da632 bazel: Make compiled jars java 6 binary compatible.
See: https://github.com/bazelbuild/bazel/issues/3198
2017-06-16 12:50:35 +02:00
Jakob Buchgraber
d0e6f3b9ab bazel: add bazel symlinks to .gitignore 2017-06-16 12:39:32 +02:00
Paul Yang
91bf623aa1 Fix php jenkins test (#3233)
Update commit id to upload latest composer.
Compile php with bc-math for future json support.
2017-06-15 13:04:08 -07:00
michaelbausor
8d97b3d8b5 Fix incorrect function call (#3232) 2017-06-15 10:49:24 -07:00
Brent Shaffer
b9b34e9b11 Follows proper autoloading standards (#3123)
* Follows proper autoloading standards
 - Splits PHP classes in descriptor.php into separate files
 - Splits MapFieldIter and RepeatedFieldIter into separate files
 - Moves descriptor.php to Internal/functions.php
 - Moves all namespaced functions into Iternal/functions.php

* fixes Makefile.am for added php files

* [PHP] moves all functions to GPBUtil

* removes description.php from the makefile
2017-06-14 15:57:11 -07:00
Thomas Van Lenten
09d2994b1f Merge pull request #3228 from thomasvl/add_tvos_to_podspec
Add tvOS to the podspec.
2017-06-14 15:57:55 -04:00
Thomas Van Lenten
6ecf38f427 Add tvOS to the podspec.
Fixes https://github.com/google/protobuf/issues/3217
2017-06-14 15:56:41 -04:00
Feng Xiao
c722c3d294 Merge pull request #3216 from traversaro/patch-1
Export symbols used in inline functions
2017-06-12 10:26:57 -07:00
Silvio Traversaro
9094bf0f7e Export symbols used in inline functions
fixed_address_empty_string symbol is used in an inline function.
We have to export it to avoid undefined reference link errors.
2017-06-12 17:09:55 +02:00
Gergely Nagy
9ba7d1c038 C++: Do not forward-declare dependencies in generated .h files 2017-06-12 14:34:51 +02:00
Adam Cozzette
96095f3a85 Merge pull request #3176 from acozzette/fix-3114
Ensure that for Java, imports of .proto files with empty packages works
2017-06-07 15:15:34 -07:00
Feng Xiao
c202b06de9 Merge pull request #3196 from matt-kwong/kokoro
Add continuous testing config files for Kokoro
2017-06-07 11:09:37 -07:00
Matt Kwong
0871e6a808 Add continuous testing config files for Kokoro 2017-06-07 11:08:00 -07:00
Feng Xiao
d4d41af19b Merge pull request #3191 from matt-kwong/kokoro
Add MacOS and Linux tests to Kokoro
2017-06-06 16:44:30 -07:00
Matt Kwong
6156af10e8 Add MacOS and Linux tests to Kokoro 2017-06-06 15:09:02 -07:00
Thomas Van Lenten
d555775836 Merge pull request #3189 from thomasvl/objc_proto3_unknown_fields
ObjC: Preserve unknown fields in proto3 syntax files.
2017-06-06 15:31:20 -04:00
Feng Xiao
2aeb4ab9c7 Merge pull request #3160 from meteorcloudy/winbuild
Refactor cc options in BUILD file for Windows
2017-06-06 10:31:21 -07:00
Adam Cozzette
ddbe36003e Merge pull request #3159 from yeswalrus/new-generate
CMake: Add modern protobuf_generate
2017-06-06 09:13:31 -07:00
Thomas Van Lenten
1d0988b8ef ObjC: Preserve unknown fields in proto3 syntax files.
As announced: https://groups.google.com/forum/#!topic/protobuf/VX5qEmTW3y0

The ObjC side of https://github.com/google/protobuf/issues/272
2017-06-06 10:44:14 -04:00
Thomas Van Lenten
516a81a424 Merge pull request #3190 from thomasvl/objc_IllegalZeroFieldNum
Properly error on a tag with field number zero.
2017-06-06 10:41:04 -04:00
Thomas Van Lenten
ecc0f54127 Properly error on a tag with field number zero. 2017-06-06 10:14:41 -04:00
Adam Cozzette
656dedbf07 Merge pull request #3157 from yeswalrus/fix-version-check
Fix CMake version check
2017-06-05 14:19:23 -07:00
Paul Yang
6f325805c0 Add new file option php_namespace. (#3162)
* Add new file option php_namespace.

Use this option to change the namespace of php generated classes.
Default is empty. When this option is empty, the package name will be
used for determining the namespace.

* Uncomment commented tests

* Revert gdb test change

* Update csharp descriptor.

* Add test for empty php_namespace.
2017-06-05 00:10:18 -07:00
Walter Gray
df3f8cf6dd fix check_and_save_build_option not correctly exporting build options 2017-06-02 19:59:03 -07:00
Walter Gray
0336770801 add protobuf_generate function, allows use of target_sources where available 2017-06-02 19:57:08 -07:00
Adam Cozzette
e9c15d601e Ensure that for Java, imports of .proto files with empty packages works
This fixes a compiler bug that caused a Java syntax error when one .proto file
would import another one with an empty package and java_package. This fixes
issue #3114.
2017-06-02 13:45:57 -07:00
Thomas Van Lenten
fbaad3617f Merge pull request #3169 from dmaclach/master
Optimize GPBDictionary.m codegen to reduce size of library
2017-06-01 15:34:00 -04:00