Commit Graph

564 Commits

Author SHA1 Message Date
Thanet (Knack) Praneenararat
0f1574aae2 Fixed bugs of OneofDescriptor. 2022-06-09 17:00:00 +09:00
Thanet (Knack) Praneenararat
594f2a9b0d Fixes bugs of isSynthetic and makes containing_oneof work 2022-06-04 01:40:22 +09:00
Thanet (Knack) Praneenararat
238331b359 Added support for getRealContainingOneof() and getContainingOneof() 2022-06-03 17:19:23 +09:00
Thanet (Knack) Praneenararat
b27dd18676 Exposed more functions in FieldDescriptor and OneofDescriptor. 2022-06-03 00:08:44 +09:00
Sandy Zhang
258514019f Merge 21.x into main 2022-05-28 00:06:34 +00:00
Protobuf Team Bot
38e3a11a29 Updating version.json and repo version numbers to: 21.1 2022-05-27 14:07:46 -04:00
Protobuf Team Bot
59c6ff83e9 Updating version.json and repo version numbers to: 21.0 2022-05-25 13:51:01 -07:00
Joshua Haberman
8984184e54 Revert "fix: reserve "ReadOnly" keyword for PHP 8.1 and add compatibility (#9633)"
This reverts commit eb27c201f1.
2022-05-24 21:06:00 +00:00
Deanna Garcia
da481978af Merge 21.x back to main 2022-05-20 17:39:11 +00:00
David L. Jones
7f2368933a Re-generate csharp and php golden proto files after changes to descriptor.proto. 2022-05-19 16:02:36 -07:00
Protobuf Team Bot
1fa42c4be4 Updating version.json and repo version numbers to: 21.0-rc2 2022-05-19 13:35:48 -07:00
Joshua Haberman
a04d00312f Fixed PHP SEGV by not writing to shared memory for zend_class_entry. 2022-05-19 04:15:51 +00:00
Joshua Haberman
8a46882bf0 Brought the comment up to date. 2022-05-19 04:13:16 +00:00
Joshua Haberman
65a2a52df3 Fixed PHP SEGV by not writing to shared memory for zend_class_entry. 2022-05-18 21:39:30 +00:00
Protobuf Team
d259bd3287 Updating version.json and repo version numbers to: 21.0-rc1 2022-05-10 11:34:07 -07:00
Joshua Haberman
d8b0884442
Merge pull request #9536 from bshaffer/patch-2
chore: [PHP] fix phpdoc for MapField keys
2022-05-06 10:21:35 -07:00
David L. Jones
95da0ba5b4
Rename all BUILD files to BUILD.bazel (#9892)
This avoids conflicting names in a couple of cases.

1. Within google, we want to sync files but not name them BUILD (since the structure doesn't match).
2. On case-insensitive filesystems, `build` may be used for a build directory. Naming `BUILD.bazel` avoids potentioal conflicts.
2022-04-29 17:57:55 -07:00
Noah Dietz
4d56f2d83c
Change enum string name for reserved words (#9780)
* Change enum string name for reserved words

Update PHP descriptor protos

* conditionally generate value compat code
2022-04-26 09:44:39 -07:00
David L. Jones
d76f8c868c
Add source distribution packaging rules (#9835)
This change adds `rules_pkg`-based targets that will produce source distribution archives, similar to `make dist`.

These rules produce nearly the same outputs as `make dist`. However, there are some differences and caveats:

1. The outputs do not contain vendored googletest sources.
2. You have to run `autogen.sh` before `blaze build pkg:all`. This produces several autotools-related files directly into the source tree.
3. The output .zip files do not have a directory prefix like `protobuf-3.20.1-rc-1` (this will be addressed after [Substitute package variables in `pkg_zip#package_dir`. bazelbuild/rules_pkg#577](https://github.com/bazelbuild/rules_pkg/pull/577); the tar files do have this prefix, though.)
4. One file is missing from the archives, which is produced during the `make` build: benchmarks/gogo/cpp_no_group/cpp_benchmark.cc
5. In several places, I have explicitly excluded some files that are not in the autotools distribution outputs. I think most of those files should probably be included, but for now, I'm aiming for parity with `make dist`. These are marked with comments, so it should be easy to clean them up later.
2022-04-22 16:58:16 -07:00
Joshua Haberman
f80137c46d Merge branch 'main' into merge-to-main 2022-04-22 02:44:36 +00:00
Joshua Haberman
634a5681b8 Fixed PHP release script.
Previously it was releasing content from main/master, not the
release branch!

I fixed this by not checking out a separate copy of protobuf.
Also updated the composer.json so we don't need to rewrite it with
sed.
2022-04-21 23:38:04 +00:00
Joshua Haberman
296c1fdaff
Update protobuf version (#9820)
* Update protobuf version

* Updated Makefile.am for composer.json move.
2022-04-20 16:00:42 -07:00
Brent Shaffer
6387f95aa9
fix: move composer.json out of root to avoid confusion (#9819)
* move composer.json out of root to avoid confusion

* fix: update php deployed json
2022-04-20 14:51:11 -07:00
Brent Shaffer
81e5139679
fix: phpdoc for repeatedfield (#9783)
* fix-phpdoc-for-protobuf-repeatedfield

* fix: offsetSet should accept null
2022-04-18 16:14:56 -07:00
Brent Shaffer
9ba808b798
fix: phpdoc syntax for repeatedfield parameters (#9784) 2022-04-18 16:07:02 -07:00
Brent Shaffer
eb27c201f1
fix: reserve "ReadOnly" keyword for PHP 8.1 and add compatibility (#9633)
* fix: reserve "ReadOnly" keyword for PHP 8.1 and add compatibility

* typo fix - readme > readonly
2022-04-12 15:48:14 -07:00
mkruskal-google
85aa87cbc9
Merge 3.20.1-rc1 into main (#9760)
* Fix NPE during encoding and add regression test for issue 9507.

(cherry picked from commit 58e320a732)

* Implement `respond_to?` in RubyMessage (#9677)

All synthetic methods implemented by `method_missing` are now supported by `respond_to?`.

Fixes issue #9202.

* Fix null pointer exceptions exposed by new regression tests.
* Fix clear_ on oneofs so that it is safe to call repeatedly and so that respond_to? does not depend on whether the oneof is currently cleared.
* Code cleanup: reenable more tests on JRuby.
* Align JRuby behavior with CRuby by throwing a RuntimeError when attempting to assign to a oneof.

(cherry picked from commit 8e7f936696)

* Update protobuf version

* Merge pull request #9727 from mlocati/build-packaged-php-extension

Fix building packaged PHP extension

(cherry picked from commit 7f9901c5f6)

* Update protobuf version

* Update changelogs for 3.20.1-rc1

Co-authored-by: Jason Lunn <jason.lunn@gmail.com>
Co-authored-by: Jorg Brown <jorg.brown@gmail.com>
2022-04-07 18:33:58 -04:00
Mike Kruskal
7db4eca77f Update changelogs for 3.20.1-rc1 2022-04-05 17:18:20 -07:00
Mike Kruskal
803e371946 Update protobuf version 2022-04-05 17:10:20 -07:00
mkruskal-google
5edc8442a4 Merge pull request #9727 from mlocati/build-packaged-php-extension
Fix building packaged PHP extension

(cherry picked from commit 7f9901c5f6)
2022-04-05 12:20:12 -07:00
mkruskal-google
7f9901c5f6
Merge pull request #9727 from mlocati/build-packaged-php-extension
Fix building packaged PHP extension
2022-04-05 12:05:32 -07:00
Mike Kruskal
a29e0e3f44 Sync from Piper @439400376
PROTOBUF_SYNC_PIPER
2022-04-04 13:42:37 -07:00
Mike Kruskal
d24edbca53 Update protobuf version 2022-04-04 11:13:56 -07:00
Michele Locati
f0936d26e1
Fix building packaged PHP extension 2022-04-03 21:52:03 +02:00
Mike Kruskal
ffe4b0cfe6 Merge branch '3.20.x' into 3.20.x-202204011233 2022-04-01 12:34:01 -07:00
Darly Paredes
25045e3f69 Update protobuf version 2022-03-25 19:20:51 +00:00
Joshua Haberman
bc799d78f8
Added missing files and fixed file roles. (#9672) 2022-03-24 11:51:33 -07:00
Adam Cozzette
a336ba0346 Sync from Piper @435734090
PROTOBUF_SYNC_PIPER
2022-03-18 21:25:56 +00:00
theodorerose
523d94a445 update PHP release to not fail on existing tag 2022-03-18 15:54:55 +00:00
theodorerose
ebfa0d345e Update protobuf version 2022-03-15 21:12:45 +00:00
Adam Cozzette
b20209f321 Sync from Piper @acozzette/proto_github_202203101748
PROTOBUF_SYNC_PIPER
2022-03-10 18:36:42 +00:00
Adam Cozzette
5ad0697c86
Merge pull request #9604 from protocolbuffers/3.20.x
Merge 3.20.x into master
2022-03-08 14:38:23 -08:00
Go Kudo
d1d13ed6fa
[PHP] Remove unnecessary zval initialization (#9600)
* [PHP] remove unneccesary zval

* fix memory leak, warning, Makefile
2022-03-08 14:35:48 -08:00
Adam Cozzette
357e71679e
Merge pull request #9588 from protocolbuffers/master
Merge master into 3.20.x
2022-03-08 12:24:24 -08:00
Joshua Haberman
349d74d92e
Updated PHP upb, and utf8_range for Ruby/PHP (#9585)
* Updated PHP to the new version of upb.

This is a large change, as the upb API surface has been
renamed to follow Google style more closely.

* Fixed utf8_range.

* Updated Ruby for new utf8_range.

* Picked up new upb for PHP, with spelling fixes.

* Fixed the 32-bit build.
2022-03-05 11:55:57 -08:00
Adam Cozzette
88a18db91e Update protobuf version 2022-03-04 09:52:19 -08:00
Brent Shaffer
023fe6ff4d
chore: [PHP] fix phpdoc for MapField keys
anything other than `string|int` is not a valid offset type. `bool` may be added, but it's not a true offset because it will be cast to an `int` if used:

```php
$a = [false => '1' , true => '2'];
$a[0] = '3';
$a[1] = '4';
var_dump($a);
// array(2) {
//   [0]=>
//   string(1) "3"
//   [1]=>
//   string(1) "4"
// }
```
2022-02-23 10:26:32 -08:00
David L. Jones
1ba1d73e0d Sync from Piper @429333699
PROTOBUF_SYNC_PIPER
2022-02-17 09:53:51 -08:00
Joshua Haberman
dce403a8b3 Sync from Piper @427369078
PROTOBUF_SYNC_PIPER
2022-02-08 20:53:31 -08:00
deannagarcia
fa4ba87aff
Merge branch 'master' into sync-stage 2022-02-02 15:24:33 -08:00