drop php 8.0 support (#1256)

* bump php to 8.1, apply rector
* readonly and typehints
* suppress a dodgy readonly property conversion
* remove some redundant readonly phpdocs
* dont run workflows against 8.0
* more readonly and typehints
* phpdoc reformat
* typehints
* remove php81 polyfill
* revert a rector BC breaking change, and disable that rector for ParentBased

Author: brettmc

Context.php

@@ -16,8 +16,7 @@ final class Context implements ContextInterface
 {
     private const OTEL_PHP_DEBUG_SCOPES_DISABLED = 'OTEL_PHP_DEBUG_SCOPES_DISABLED';
 
-    /** @var ContextStorageInterface&ExecutionContextAwareInterface */
-    private static ContextStorageInterface $storage;
+    private static ContextStorageInterface&ExecutionContextAwareInterface $storage;
 
     // Optimization for spans to avoid copying the context array.
     private static ContextKeyInterface $spanContextKey;
@@ -37,20 +36,12 @@ public static function createKey(string $key): ContextKeyInterface
         return new ContextKey($key);
     }
 
-    /**
-     * @param ContextStorageInterface&ExecutionContextAwareInterface $storage
-     * @todo update type-hint (php >= 8.1)
-     */
-    public static function setStorage(ContextStorageInterface $storage): void
+    public static function setStorage(ContextStorageInterface&ExecutionContextAwareInterface $storage): void
     {
         self::$storage = $storage;
     }
 
-    /**
-     * @return ContextStorageInterface&ExecutionContextAwareInterface
-     * @todo update return type-hint (php >= 8.1)
-     */
-    public static function storage(): ContextStorageInterface
+    public static function storage(): ContextStorageInterface&ExecutionContextAwareInterface
     {
         /** @psalm-suppress RedundantPropertyInitializationCheck */
         return self::$storage ??= new ContextStorage();

ContextKey.php

@@ -10,7 +10,7 @@
  */
 final class ContextKey implements ContextKeyInterface
 {
-    public function __construct(private ?string $name = null)
+    public function __construct(private readonly ?string $name = null)
     {
     }
 

ContextStorage.php

@@ -19,17 +19,17 @@ public function __construct()
         $this->current = $this->main = new ContextStorageHead($this);
     }
 
-    public function fork($id): void
+    public function fork(int|string $id): void
     {
         $this->forks[$id] = clone $this->current;
     }
 
-    public function switch($id): void
+    public function switch(int|string $id): void
     {
         $this->current = $this->forks[$id] ?? $this->main;
     }
 
-    public function destroy($id): void
+    public function destroy(int|string $id): void
     {
         unset($this->forks[$id]);
     }

DebugScope.php

@@ -24,11 +24,11 @@ final class DebugScope implements ScopeInterface
 {
     private static bool $shutdownHandlerInitialized = false;
     private static bool $finalShutdownPhase = false;
-    private ?int $fiberId;
-    private array $createdAt;
+    private readonly ?int $fiberId;
+    private readonly array $createdAt;
     private ?array $detachedAt = null;
 
-    public function __construct(private ContextStorageScopeInterface $scope)
+    public function __construct(private readonly ContextStorageScopeInterface $scope)
     {
         $this->fiberId = self::currentFiberId();
         $this->createdAt = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
@@ -114,7 +114,7 @@ private static function formatBacktrace(array $trace): string
             $s .= strtr($trace[$i]['function'] ?? '{main}', ['\\' => '.']);
             $s .= '(';
             if (isset($trace[$i - 1]['file'])) {
-                $s .= basename($trace[$i - 1]['file']);
+                $s .= basename((string) $trace[$i - 1]['file']);
                 if (isset($trace[$i - 1]['line'])) {
                     $s .= ':';
                     $s .= $trace[$i - 1]['line'];

ExecutionContextAwareInterface.php

@@ -6,18 +6,9 @@
 
 interface ExecutionContextAwareInterface
 {
-    /**
-     * @param int|string $id
-     */
-    public function fork($id): void;
+    public function fork(int|string $id): void;
 
-    /**
-     * @param int|string $id
-     */
-    public function switch($id): void;
+    public function switch(int|string $id): void;
 
-    /**
-     * @param int|string $id
-     */
-    public function destroy($id): void;
+    public function destroy(int|string $id): void;
 }

FiberBoundContextStorage.php

@@ -20,24 +20,21 @@
  */
 final class FiberBoundContextStorage implements ContextStorageInterface, ExecutionContextAwareInterface
 {
-    /**
-     * @param ContextStorageInterface&ExecutionContextAwareInterface $storage
-     */
-    public function __construct(private ContextStorageInterface $storage)
+    public function __construct(private readonly ContextStorageInterface&ExecutionContextAwareInterface $storage)
     {
     }
 
-    public function fork($id): void
+    public function fork(int|string $id): void
     {
         $this->storage->fork($id);
     }
 
-    public function switch($id): void
+    public function switch(int|string $id): void
     {
         $this->storage->switch($id);
     }
 
-    public function destroy($id): void
+    public function destroy(int|string $id): void
     {
         $this->storage->destroy($id);
     }

Propagation/MultiTextMapPropagator.php

@@ -13,20 +13,16 @@
 
 final class MultiTextMapPropagator implements TextMapPropagatorInterface
 {
-    /**
-     * @readonly
-     * @var list<string>
-     */
-    private array $fields;
+    /** @var list<string> */
+    private readonly array $fields;
 
     /**
      * @no-named-arguments
      *
      * @param list<TextMapPropagatorInterface> $propagators
      */
     public function __construct(
-        /** @readonly */
-        private array $propagators,
+        private readonly array $propagators,
     ) {
         $this->fields = $this->extractFields($this->propagators);
     }

Propagation/SanitizeCombinedHeadersPropagationGetter.php

@@ -18,7 +18,7 @@ final class SanitizeCombinedHeadersPropagationGetter implements PropagationGette
     private const SERVER_CONCAT_HEADERS_REGEX = '/;(?=[^,=;]*=|$)/';
     private const TRAILING_LEADING_SEPARATOR_REGEX = '/^' . self::LIST_MEMBERS_SEPARATOR . '+|' . self::LIST_MEMBERS_SEPARATOR . '+$/';
 
-    public function __construct(private PropagationGetterInterface $getter)
+    public function __construct(private readonly PropagationGetterInterface $getter)
     {
     }
 

composer.json

@@ -17,8 +17,7 @@
         }
     ],
     "require": {
-        "php": "^8.0",
-        "symfony/polyfill-php81": "^1.26",
+        "php": "^8.1",
         "symfony/polyfill-php82": "^1.26"
     },
     "autoload": {