Skip to content

Commit 743ad21

Browse files
committed
add for conformance_php_c
1 parent 9ce85a4 commit 743ad21

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

BUILD.bazel

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,10 @@ internal_objc_proto_library(
591591
internal_php_proto_library(
592592
name = "test_messages_proto3_php_proto",
593593
testonly = 1,
594-
srcs = ["//src/google/protobuf:test_messages_proto3.proto"],
594+
srcs = [
595+
"//src/google/protobuf:test_messages_proto3.proto",
596+
# "//src/google/protobuf/editions:golden/test_messages_proto3_editions.proto",
597+
],
595598
outs = [
596599
"GPBMetadata/TestMessagesProto3.php",
597600
"Protobuf_test_messages/Proto3/EnumOnlyProto3.php",

conformance/conformance_php.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
require_once("Conformance/FailureSet.php");
77
require_once("Conformance/JspbEncodingConfig.php");
88
require_once("Conformance/TestCategory.php");
9-
require_once("Protobuf_test_messages/Proto3/ForeignMessage.php");
10-
require_once("Protobuf_test_messages/Proto3/ForeignEnum.php");
9+
#require_once("Protobuf_test_messages/Proto3/ForeignMessage.php");
10+
#require_once("Protobuf_test_messages/Proto3/ForeignEnum.php");
1111
require_once("Protobuf_test_messages/Proto3/TestAllTypesProto3.php");
1212
require_once("Protobuf_test_messages/Proto3/TestAllTypesProto3/AliasedEnum.php");
1313
require_once("Protobuf_test_messages/Proto3/TestAllTypesProto3/NestedMessage.php");

php/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ conformance_test(
8080
"@platforms//os:osx": [],
8181
"//conditions:default": ["@platforms//:incompatible"],
8282
}),
83+
maximum_edition = "2023",
8384
testee = "//conformance:conformance_php_c",
8485
text_format_failure_list = "//conformance:text_format_failure_list_php.txt",
8586
)

php/generate_test_protos.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ if [[ -z "${PROTOC}" ]]; then
99
fi
1010
if [ ! -f $PROTOC ]; then
1111
${BAZEL:-bazel} $BAZEL_STARTUP_FLAGS build -c opt //:protoc $BAZEL_FLAGS
12-
PROTOC=$(pwd)/bazel-bin/protoc
12+
PROTOC="$(pwd)/bazel-bin/protoc --experimental_editions"
13+
echo "USING LOCAL PROTOC ($PROTOC)"
1314
fi
1415

1516
if [[ -d php/tmp && -z $(find php/tests/proto $PROTOC -newer php/tmp) ]]; then

0 commit comments

Comments
 (0)