Pre-release changes for 0.83.1-beta-sfx8 (#129)

signalfx · Feb 28, 2023 · 263811f · 263811f
1 parent 08f3341
commit 263811f
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 41 deletions.
diff --git 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
@@ -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 ? "<br><br>" : "\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
@@ -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
@@ -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
@@ -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
diff --git a/tests/randomized/app/composer-5.5.json b/tests/randomized/app/composer-5.5.json
diff --git a/tests/randomized/app/composer-5.6.json b/tests/randomized/app/composer-5.6.json
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -4,6 +4,11 @@
             "RandomizedTests\\": "./src/RandomizedTests"
         }
     },
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
+    },
     "require": {
         "elasticsearch/elasticsearch": "^8.0",
         "guzzlehttp/guzzle": "7.*",