Skip to content

Commit c2c81d4

Browse files
authored
Merge branch 'master' into php-8-5
2 parents 5a4c07c + a773a0d commit c2c81d4

151 files changed

Lines changed: 7363 additions & 576 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
/resources/scripts/ export-ignore
66
/runtime/ export-ignore
77
/tests/ export-ignore
8+
/patches/ export-ignore
89

910
/*.xml export-ignore
1011
/*.xml.dist export-ignore
1112
Makefile export-ignore
13+
patches.lock.json export-ignore

.github/CODEOWNERS

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
* @temporalio/sdk
2-
* @roxblnfk
3-
* @wolfy-j
1+
* @temporalio/sdk @roxblnfk @wolfy-j

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"ext-curl": "*",
2626
"ext-json": "*",
2727
"google/common-protos": "^4.9",
28-
"google/protobuf": "^4.31.1",
28+
"google/protobuf": "^4.33.6 || ^5.34.0",
2929
"grpc/grpc": "^1.57",
3030
"internal/destroy": "^1.0",
3131
"internal/promise": "^3.4",
@@ -62,7 +62,7 @@
6262
"cweagans/composer-patches": "^2.0",
6363
"dereuromark/composer-prefer-lowest": "^0.1.10",
6464
"doctrine/annotations": "^1.14.4 || ^2.0.2",
65-
"internal/dload": "^1.2.0",
65+
"internal/dload": "^1.10.0",
6666
"internal/toml": "^1.0.3",
6767
"jetbrains/phpstorm-attributes": "dev-master",
6868
"laminas/laminas-code": "^4.16",

phpunit.xml.dist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
stopOnFailure="false"
1010
stopOnError="false"
1111
stderr="true"
12+
failOnDeprecation="true"
13+
failOnPhpunitDeprecation="true"
14+
stopOnDeprecation="true"
15+
displayDetailsOnPhpunitDeprecations="true"
1216
displayDetailsOnIncompleteTests="true"
1317
displayDetailsOnSkippedTests="true"
1418
displayDetailsOnTestsThatTriggerDeprecations="true"

0 commit comments

Comments
 (0)