Merge branch '3.0.x' into latest-thrift

Author: allflame

README.md

@@ -1,19 +1,23 @@
-
 # PHP OpenTracing API using Jaeger 
 
-
 ## Installation
 
-```
+```bash
 composer require code-tool/jaeger-client-php
 ```
 
 ## Getting Started
 
-It is strictly advised to use any form of DI container (e.g. [Symfony](https://github.com/code-tool/jaeger-client-symfony-bridge)).
-```$xslt
+It is strictly advised to use any form of DI container (e.g. [Symfony Bundle](https://github.com/code-tool/jaeger-client-symfony-bridge)).
+
+```php
 <?php
 
+use Jaeger\Tag\StringTag;
+use Jaeger\Tracer\TracerInterface;
+
+/** @var TracerInterface $tracer */
+
 $span = $tracer->start('Parent Operation Name', [new StringTag('test.tag', 'Hello world in parent')]);
 $childSpan = $tracer->start('Child Operation Name', [new StringTag('test.tag', 'Hello world in child')]);
 $tracer->finish($childSpan);

composer.json

@@ -9,8 +9,7 @@
   "require": {
     "php": ">=7.1",
     "ext-sockets": "*",
-    "apache/thrift": ">=0.11, <0.16",
-    "psr/log": "^1.0.2"
+    "apache/thrift": ">=0.11, <0.16"
   },
   "require-dev": {
     "phpunit/phpunit": "@stable"

src/Codec/CodecRegistry.php

@@ -7,11 +7,19 @@ class CodecRegistry implements \ArrayAccess
 {
     private $codecs = [];
 
+    /**
+     * @return bool
+     */
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return array_key_exists($offset, $this->codecs);
     }
 
+    /**
+     * @return mixed
+     */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         if (false === array_key_exists($offset, $this->codecs)) {
@@ -21,13 +29,21 @@ public function offsetGet($offset)
         return $this->codecs[$offset];
     }
 
+    /**
+     * @return $this
+     */
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         $this->codecs[$offset] = $value;
 
         return $this;
     }
 
+    /**
+     * @return $this
+     */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         if (false === array_key_exists($offset, $this->codecs)) {

src/Span/Context/SpanContext.php

@@ -64,6 +64,10 @@ public function getBaggage(): array
         return $this->baggage;
     }
 
+    /**
+     * @return \Traversable
+     */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return new \ArrayIterator($this->baggage);