add return type hints (#1351)

now that 7.4 and 8.0 support is dropped, we can add correct return type-hints to these functions, and remove the ReturnTypeWillChange attribute.
open-telemetry · Jul 19, 2024 · 1271f1e · 1271f1e
1 parent e4f9604
commit 1271f1e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/src/SDK/Common/Attribute/AttributesBuilder.php b/src/SDK/Common/Attribute/AttributesBuilder.php
@@ -49,20 +49,16 @@ public function offsetExists($offset): bool
 
     /**
      * @phan-suppress PhanUndeclaredClassAttribute
-     * @return mixed
      */
-    #[\ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         return $this->attributes[$offset] ?? null;
     }
 
     /**
      * @phan-suppress PhanUndeclaredClassAttribute
-     * @return void
      */
-    #[\ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         if ($offset === null) {
             return;
@@ -92,10 +88,8 @@ public function offsetSet($offset, $value)
 
     /**
      * @phan-suppress PhanUndeclaredClassAttribute
-     * @return void
      */
-    #[\ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         unset($this->attributes[$offset]);
     }

diff --git a/src/SDK/Common/Attribute/FilteredAttributesBuilder.php b/src/SDK/Common/Attribute/FilteredAttributesBuilder.php
@@ -48,17 +48,15 @@ public function offsetExists($offset): bool
     /**
      * @phan-suppress PhanUndeclaredClassAttribute
      */
-    #[\ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet(mixed $offset): mixed
     {
         return $this->builder->offsetGet($offset);
     }
 
     /**
      * @phan-suppress PhanUndeclaredClassAttribute
      */
-    #[\ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         if ($value !== null && in_array($offset, $this->rejectedKeys, true)) {
             $this->rejected++;
@@ -72,8 +70,7 @@ public function offsetSet($offset, $value)
     /**
      * @phan-suppress PhanUndeclaredClassAttribute
      */
-    #[\ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         $this->builder->offsetUnset($offset);
     }