Added PHP8 support for hyperf/tracer. (#4109)

* chore: upgrades to Zipkin Opentracing 2.x. * chore: fixes zipkin-opentracing version Co-authored-by: 李铭昕 <[email protected]>
hyperf · Nov 19, 2021 · b343165 · b343165
1 parent 2bb4bcd
commit b343165
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/class_map/ThriftUdpTransport.php b/class_map/ThriftUdpTransport.php
@@ -40,7 +40,7 @@ class ThriftUdpTransport extends TTransport
     private $logger;
 
     /**
-     * @var ?resource
+     * @var null|\Socket|resource
      */
     private $socket;
 
@@ -49,10 +49,6 @@ class ThriftUdpTransport extends TTransport
      */
     private $chan;
 
-    /**
-     * ThriftUdpTransport constructor.
-     * @param LoggerInterface $logger
-     */
     public function __construct(string $host, int $port, LoggerInterface $logger = null)
     {
         $this->host = $host;

diff --git a/composer.json b/composer.json
@@ -22,12 +22,12 @@
         "hyperf/di": "~2.2.0",
         "hyperf/guzzle": "~2.2.0",
         "hyperf/utils": "~2.2.0",
-        "jcchavezs/zipkin-opentracing":"^1.0",
-        "opentracing/opentracing":"^1.0"
+        "jcchavezs/zipkin-opentracing": "^1.0|^2.0",
+        "opentracing/opentracing": "^1.0"
     },
     "suggest": {
         "hyperf/event": "Required to use DbQueryExecutedListener.",
-        "jonahgeorge/jaeger-client-php":"Required (^0.6) to use jaeger tracing."
+        "jonahgeorge/jaeger-client-php": "Required (^0.6) to use jaeger tracing."
     },
     "autoload": {
         "psr-4": {
@@ -36,6 +36,7 @@
     },
     "autoload-dev": {
         "psr-4": {
+            "HyperfTest\\Tracer\\": "tests/"
         }
     },
     "config": {