Skip to content

Commit 50840e0

Browse files
morrisonlevimorrisonlevi
committed
Merge branch 'master' into florian/zts-global-state
2 parents 464aaab + af1e5d8 commit 50840e0

16 files changed

Lines changed: 104 additions & 79 deletions

File tree

‎Makefile‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,6 +667,7 @@ TEST_INTEGRATIONS_72 := \
667667
test_integrations_phpredis4 \
668668
test_integrations_phpredis5 \
669669
test_integrations_predis_1 \
670+
test_integrations_predis_2 \
670671
test_integrations_predis_latest \
671672
test_integrations_ratchet \
672673
test_integrations_sqlsrv \
@@ -728,6 +729,7 @@ TEST_INTEGRATIONS_73 :=\
728729
test_integrations_phpredis4 \
729730
test_integrations_phpredis5 \
730731
test_integrations_predis_1 \
732+
test_integrations_predis_2 \
731733
test_integrations_predis_latest \
732734
test_integrations_ratchet \
733735
test_integrations_sqlsrv \
@@ -790,6 +792,7 @@ TEST_INTEGRATIONS_74 := \
790792
test_integrations_phpredis4 \
791793
test_integrations_phpredis5 \
792794
test_integrations_predis_1 \
795+
test_integrations_predis_2 \
793796
test_integrations_predis_latest \
794797
test_integrations_ratchet \
795798
test_integrations_roadrunner \
@@ -858,6 +861,7 @@ TEST_INTEGRATIONS_80 := \
858861
test_integrations_pcntl \
859862
test_integrations_phpredis5 \
860863
test_integrations_predis_1 \
864+
test_integrations_predis_2 \
861865
test_integrations_predis_latest \
862866
test_integrations_ratchet \
863867
test_integrations_sqlsrv \
@@ -903,7 +907,6 @@ TEST_INTEGRATIONS_81 := \
903907
test_integrations_monolog2 \
904908
test_integrations_monolog_latest \
905909
test_integrations_mysqli \
906-
test_integrations_openai_latest \
907910
test_opentelemetry_1 \
908911
test_opentelemetry_beta \
909912
test_integrations_googlespanner_latest \
@@ -914,6 +917,7 @@ TEST_INTEGRATIONS_81 := \
914917
test_integrations_elasticsearch8 \
915918
test_integrations_phpredis5 \
916919
test_integrations_predis_1 \
920+
test_integrations_predis_2 \
917921
test_integrations_predis_latest \
918922
test_integrations_ratchet \
919923
test_integrations_sqlsrv \
@@ -974,6 +978,7 @@ TEST_INTEGRATIONS_82 := \
974978
test_integrations_elasticsearch_latest \
975979
test_integrations_phpredis5 \
976980
test_integrations_predis_1 \
981+
test_integrations_predis_2 \
977982
test_integrations_predis_latest \
978983
test_integrations_frankenphp \
979984
test_integrations_ratchet \
@@ -1041,6 +1046,7 @@ TEST_INTEGRATIONS_83 := \
10411046
test_integrations_elasticsearch_latest \
10421047
test_integrations_phpredis5 \
10431048
test_integrations_predis_1 \
1049+
test_integrations_predis_2 \
10441050
test_integrations_predis_latest \
10451051
test_integrations_frankenphp \
10461052
test_integrations_ratchet \
@@ -1100,6 +1106,7 @@ TEST_INTEGRATIONS_84 := \
11001106
test_integrations_elasticsearch7 \
11011107
test_integrations_elasticsearch8 \
11021108
test_integrations_elasticsearch_latest \
1109+
test_integrations_predis_2 \
11031110
test_integrations_predis_latest \
11041111
test_integrations_frankenphp \
11051112
test_integrations_ratchet \
@@ -1360,6 +1367,8 @@ test_integrations_phpredis5: global_test_run_dependencies
13601367
$(eval TEST_EXTRA_ENV=)
13611368
test_integrations_predis_1: global_test_run_dependencies tests/Integrations/Predis/V1/composer.lock-php$(PHP_MAJOR_MINOR)
13621369
$(call run_tests_debug,tests/Integrations/Predis/V1)
1370+
test_integrations_predis_2: global_test_run_dependencies tests/Integrations/Predis/V2/composer.lock-php$(PHP_MAJOR_MINOR)
1371+
$(call run_tests_debug,tests/Integrations/Predis/V2)
13631372
test_integrations_predis_latest: global_test_run_dependencies tests/Integrations/Predis/Latest/composer.lock-php$(PHP_MAJOR_MINOR)
13641373
$(call run_tests_debug,tests/Integrations/Predis/Latest)
13651374
test_integrations_frankenphp: global_test_run_dependencies

‎aggregated_tested_versions.json‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"cakephp/cakephp": [
33
"3.10.5",
44
"4.6.1",
5-
"5.2.2"
5+
"5.2.3"
66
],
77
"drupal/drupal": [
88
"10.1.3",
@@ -86,7 +86,7 @@
8686
"6.0.0"
8787
],
8888
"google/cloud-spanner": [
89-
"1.98.0"
89+
"1.99.0"
9090
],
9191
"guzzlehttp/guzzle": [
9292
"5.3.4",
@@ -107,7 +107,7 @@
107107
"laravel/framework": [
108108
"10.48.29",
109109
"11.44.7",
110-
"12.9.2",
110+
"12.12.0",
111111
"4.2.22",
112112
"5.7.29",
113113
"5.8.38",
@@ -147,7 +147,7 @@
147147
"3.2.6"
148148
],
149149
"openai-php/client": [
150-
"0.10.3"
150+
"0.12.0"
151151
],
152152
"php-amqplib/php-amqplib": [
153153
"2.12.1",
@@ -156,7 +156,8 @@
156156
],
157157
"predis/predis": [
158158
"1.1.10",
159-
"2.3.0"
159+
"2.4.0",
160+
"3.0.0"
160161
],
161162
"ratchet/pawl": [
162163
"0.4.1"
@@ -175,7 +176,7 @@
175176
"symfony/console": [
176177
"5.2.14",
177178
"6.2.13",
178-
"7.2.5"
179+
"7.2.6"
179180
],
180181
"symfony/framework-bundle": [
181182
"2.3.42",
@@ -196,7 +197,7 @@
196197
"4.4.49",
197198
"5.2.12",
198199
"6.2.13",
199-
"7.2.5"
200+
"7.2.6"
200201
],
201202
"wordpress": [
202203
"4.8.10",

‎integration_versions.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| Library | Min. Supported Version | Max. Supported Version |
22
|-----------------------------|------------------------|------------------------|
3-
| cakephp/cakephp | 3.10.5 | 5.2.2 |
3+
| cakephp/cakephp | 3.10.5 | 5.2.3 |
44
| drupal/drupal | 8.9.21 | 10.1.3 |
55
| elasticsearch/elasticsearch | 1.2.2 | 9.0.0 |
66
| ext-PDO | 7.0.33 | 8.3.19 |
@@ -13,28 +13,28 @@
1313
| ext-redis | 3.1.6 | 5.3.7 |
1414
| ext-sqlsrv | 5.3.0 | 5.12.0 |
1515
| ext-swoole | 5.1.6 | 6.0.0 |
16-
| google/cloud-spanner | 1.98.0 | 1.98.0 |
16+
| google/cloud-spanner | 1.99.0 | 1.99.0 |
1717
| guzzlehttp/guzzle | 5.3.4 | 7.9.3 |
1818
| laminas-api-tools/api-tools | 1.7.0 | 1.7.0 |
1919
| laminas/laminas-log | 2.16.1 | 2.17.1 |
2020
| laminas/laminas-mvc | 3.3.5 | 3.8.0 |
21-
| laravel/framework | 4.2.22 | 12.9.2 |
21+
| laravel/framework | 4.2.22 | 12.12.0 |
2222
| laravel/lumen-framework | 5.2.9 | 10.0.4 |
2323
| laravel/octane | 2.9.1 | 2.9.1 |
2424
| magento/magento2 | 2.3.7 | 2.4.6 |
2525
| mongodb/mongodb | 1.8.0 | 2.0.0 |
2626
| monolog/monolog | 1.27.1 | 3.9.0 |
2727
| nette/application | 2.4.17 | 3.2.6 |
28-
| openai-php/client | 0.10.3 | 0.10.3 |
28+
| openai-php/client | 0.12.0 | 0.12.0 |
2929
| php-amqplib/php-amqplib | 2.12.1 | 3.7.3 |
30-
| predis/predis | 1.1.10 | 2.3.0 |
30+
| predis/predis | 1.1.10 | 3.0.0 |
3131
| ratchet/pawl | 0.4.1 | 0.4.1 |
3232
| shardj/zf1-future | 1.21.4 | 1.21.4 |
3333
| slim/slim | 3.12.5 | 4.14.0 |
3434
| spiral/roadrunner | 2.11.4 | 2.11.4 |
35-
| symfony/console | 5.2.14 | 7.2.5 |
35+
| symfony/console | 5.2.14 | 7.2.6 |
3636
| symfony/framework-bundle | 2.3.42 | 7.2.5 |
37-
| symfony/messenger | 4.4.49 | 7.2.5 |
37+
| symfony/messenger | 4.4.49 | 7.2.6 |
3838
| wordpress | 4.8.10 | 6.1.1 |
3939
| yiisoft/yii2 | 2.0.49 | 2.0.52 |
4040
| zendframework/zf1 | 1.12.20 | 1.12.20 |

‎tests/Frameworks/CakePHP/Latest/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"license": "MIT",
77
"require": {
88
"php": ">=8.1",
9-
"cakephp/cakephp": "5.2.2",
9+
"cakephp/cakephp": "5.2.3",
1010
"cakephp/migrations": "^4.0.0",
1111
"cakephp/plugin-installer": "^2.0",
1212
"mobiledetect/mobiledetectlib": "^3.74"

‎tests/Frameworks/Laravel/Latest/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"license": "MIT",
1010
"require": {
1111
"php": "^8.2",
12-
"laravel/framework": "12.9.2",
12+
"laravel/framework": "12.12.0",
1313
"laravel/tinker": "^2.9"
1414
},
1515
"require-dev": {

‎tests/Frameworks/Symfony/Latest/composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
"doctrine/orm": "^2.17",
1414
"phpdocumentor/reflection-docblock": "^5.6",
1515
"phpstan/phpdoc-parser": "^2.0",
16-
"symfony/console": "7.2.5",
16+
"symfony/console": "7.2.6",
1717
"symfony/doctrine-messenger": "^7.1",
1818
"symfony/dotenv": "*",
1919
"symfony/flex": "^2",
2020
"symfony/form": "*",
2121
"symfony/framework-bundle": "7.2.5",
22-
"symfony/messenger": "7.2.5",
22+
"symfony/messenger": "7.2.6",
2323
"symfony/monolog-bundle": "^3.10",
2424
"symfony/property-access": "*",
2525
"symfony/property-info": "*",
@@ -93,4 +93,4 @@
9393
"require-dev": {
9494
"symfony/maker-bundle": "^1.49"
9595
}
96-
}
96+
}

‎tests/Integrations/GoogleSpanner/Latest/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"google/cloud-spanner": "1.98.0"
3+
"google/cloud-spanner": "1.99.0"
44
},
55
"provide": {
66
"ext-grpc": "*"

‎tests/Integrations/OpenAI/Latest/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"openai-php/client": "0.10.3",
3+
"openai-php/client": "0.12.0",
44
"guzzlehttp/guzzle": "^7.8.1",
55
"guzzlehttp/psr7": "^2.6.2"
66
}

‎tests/Integrations/Predis/Latest/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"require": {
3-
"predis/predis": "2.3.0"
3+
"predis/predis": "3.0.0"
44
}
55
}

‎tests/Integrations/Predis/V2/PredisTest.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
namespace DDTrace\Tests\Integrations\Predis\V2;
4+
5+
use Predis\Configuration\Options;
6+
7+
class PredisTest extends \DDTrace\Tests\Integrations\Predis\Latest\PredisTest
8+
{
9+
//
10+
}

0 commit comments

Comments
 (0)