diff --git a/composer.json b/composer.json index 4dfe876b6..104c53d2f 100644 --- a/composer.json +++ b/composer.json @@ -28,14 +28,15 @@ "ext-posix": "*", "g1a/composer-test-scenarios": "~3.0", "mockery/mockery": "*", - "phpunit/phpunit": "*", + "phpunit/phpunit": "<10", "squizlabs/php_codesniffer": "^3.3.0", "symfony/process": "<5" }, "config": { "sort-packages": true, "allow-plugins": { - "g1a/composer-test-scenarios": true + "g1a/composer-test-scenarios": true, + "php-http/discovery": true } }, "autoload": { diff --git a/ext/ddtrace.c b/ext/ddtrace.c index 00a4294b0..9f2411a96 100644 --- a/ext/ddtrace.c +++ b/ext/ddtrace.c @@ -1058,7 +1058,7 @@ static PHP_MINFO_FUNCTION(ddtrace) { "https://docs.splunk.com/Observability/gdi/get-data-in/application/php/get-started.html"); } datadog_info_print(!sapi_module.phpinfo_as_text ? "

" : "\n"); - datadog_info_print("(c) Datadog 2020\n"); + datadog_info_print("(c) Splunk 2023, Datadog 2020\n"); php_info_print_box_end(); php_info_print_table_start(); diff --git a/ext/version.h b/ext/version.h index d92aa67bc..7ca39f285 100644 --- a/ext/version.h +++ b/ext/version.h @@ -1,4 +1,4 @@ #ifndef PHP_DDTRACE_VERSION // Must begin with a number for Debian packaging requirements -#define PHP_DDTRACE_VERSION "0.78.0-beta-sfx7" +#define PHP_DDTRACE_VERSION "0.83.1-beta-sfx8" #endif diff --git a/src/DDTrace/Tracer.php b/src/DDTrace/Tracer.php index 5b3c14c72..d7c69e045 100644 --- a/src/DDTrace/Tracer.php +++ b/src/DDTrace/Tracer.php @@ -24,7 +24,7 @@ final class Tracer implements TracerInterface * Must begin with a number for Debian packaging requirements * Must use single-quotes for packaging script to work */ - const VERSION = '0.78.0-beta-sfx7'; + const VERSION = '0.83.1-beta-sfx8'; /** * @var Span[][] diff --git a/tests/composer.json b/tests/composer.json index b1256b791..1e4f743f6 100644 --- a/tests/composer.json +++ b/tests/composer.json @@ -8,14 +8,15 @@ }, "require-dev": { "mockery/mockery": "*", - "phpunit/phpunit": "*", + "phpunit/phpunit": "<10", "phpspec/prophecy": "*", "symfony/process": "<5", "g1a/composer-test-scenarios": "~3.0" }, "config": { "allow-plugins": { - "g1a/composer-test-scenarios": true + "g1a/composer-test-scenarios": true, + "php-http/discovery": true } }, "extra": { diff --git a/tests/randomized/app/composer-5.4.json b/tests/randomized/app/composer-5.4.json deleted file mode 100644 index 18207bc24..000000000 --- a/tests/randomized/app/composer-5.4.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "autoload": { - "psr-4": { - "RandomizedTests\\": "./src/RandomizedTests" - } - }, - "require": { - "guzzlehttp/guzzle": "5.*", - "datadog/dd-trace": "0.59.0" - } -} diff --git a/tests/randomized/app/composer-5.5.json b/tests/randomized/app/composer-5.5.json deleted file mode 100644 index 18207bc24..000000000 --- a/tests/randomized/app/composer-5.5.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "autoload": { - "psr-4": { - "RandomizedTests\\": "./src/RandomizedTests" - } - }, - "require": { - "guzzlehttp/guzzle": "5.*", - "datadog/dd-trace": "0.59.0" - } -} diff --git a/tests/randomized/app/composer-5.6.json b/tests/randomized/app/composer-5.6.json deleted file mode 100644 index 4dbe5cd25..000000000 --- a/tests/randomized/app/composer-5.6.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "autoload": { - "psr-4": { - "RandomizedTests\\": "./src/RandomizedTests" - } - }, - "require": { - "elasticsearch/elasticsearch": "5.*", - "guzzlehttp/guzzle": "6.*", - "datadog/dd-trace": "0.59.0" - } -} diff --git a/tests/randomized/app/composer-7.0.json b/tests/randomized/app/composer-7.0.json index d8400f45d..477c0529d 100644 --- a/tests/randomized/app/composer-7.0.json +++ b/tests/randomized/app/composer-7.0.json @@ -4,6 +4,11 @@ "RandomizedTests\\": "./src/RandomizedTests" } }, + "config": { + "allow-plugins": { + "php-http/discovery": true + } + }, "require": { "elasticsearch/elasticsearch": "6.*", "guzzlehttp/guzzle": "6.*", diff --git a/tests/randomized/app/composer-7.1.json b/tests/randomized/app/composer-7.1.json index d8400f45d..477c0529d 100644 --- a/tests/randomized/app/composer-7.1.json +++ b/tests/randomized/app/composer-7.1.json @@ -4,6 +4,11 @@ "RandomizedTests\\": "./src/RandomizedTests" } }, + "config": { + "allow-plugins": { + "php-http/discovery": true + } + }, "require": { "elasticsearch/elasticsearch": "6.*", "guzzlehttp/guzzle": "6.*", diff --git a/tests/randomized/app/composer-7.2.json b/tests/randomized/app/composer-7.2.json index d8400f45d..477c0529d 100644 --- a/tests/randomized/app/composer-7.2.json +++ b/tests/randomized/app/composer-7.2.json @@ -4,6 +4,11 @@ "RandomizedTests\\": "./src/RandomizedTests" } }, + "config": { + "allow-plugins": { + "php-http/discovery": true + } + }, "require": { "elasticsearch/elasticsearch": "6.*", "guzzlehttp/guzzle": "6.*", diff --git a/tests/randomized/app/composer-7.3.json b/tests/randomized/app/composer-7.3.json index d8400f45d..477c0529d 100644 --- a/tests/randomized/app/composer-7.3.json +++ b/tests/randomized/app/composer-7.3.json @@ -4,6 +4,11 @@ "RandomizedTests\\": "./src/RandomizedTests" } }, + "config": { + "allow-plugins": { + "php-http/discovery": true + } + }, "require": { "elasticsearch/elasticsearch": "6.*", "guzzlehttp/guzzle": "6.*", diff --git a/tests/randomized/app/composer-7.4.json b/tests/randomized/app/composer-7.4.json index d8400f45d..477c0529d 100644 --- a/tests/randomized/app/composer-7.4.json +++ b/tests/randomized/app/composer-7.4.json @@ -4,6 +4,11 @@ "RandomizedTests\\": "./src/RandomizedTests" } }, + "config": { + "allow-plugins": { + "php-http/discovery": true + } + }, "require": { "elasticsearch/elasticsearch": "6.*", "guzzlehttp/guzzle": "6.*", diff --git a/tests/randomized/app/composer-8.0.json b/tests/randomized/app/composer-8.0.json index 5d033e59e..d93ddbe8b 100644 --- a/tests/randomized/app/composer-8.0.json +++ b/tests/randomized/app/composer-8.0.json @@ -4,6 +4,11 @@ "RandomizedTests\\": "./src/RandomizedTests" } }, + "config": { + "allow-plugins": { + "php-http/discovery": true + } + }, "require": { "elasticsearch/elasticsearch": "^7.0", "guzzlehttp/guzzle": "7.*", diff --git a/tests/randomized/app/composer-8.1.json b/tests/randomized/app/composer-8.1.json index 429f0158a..b75a1bcf3 100644 --- a/tests/randomized/app/composer-8.1.json +++ b/tests/randomized/app/composer-8.1.json @@ -4,6 +4,11 @@ "RandomizedTests\\": "./src/RandomizedTests" } }, + "config": { + "allow-plugins": { + "php-http/discovery": true + } + }, "require": { "elasticsearch/elasticsearch": "^7.0", "guzzlehttp/guzzle": "7.*", diff --git a/tests/randomized/app/composer-8.2.json b/tests/randomized/app/composer-8.2.json index 5fc164eb0..67badc659 100644 --- a/tests/randomized/app/composer-8.2.json +++ b/tests/randomized/app/composer-8.2.json @@ -4,6 +4,11 @@ "RandomizedTests\\": "./src/RandomizedTests" } }, + "config": { + "allow-plugins": { + "php-http/discovery": true + } + }, "require": { "elasticsearch/elasticsearch": "^8.0", "guzzlehttp/guzzle": "7.*",