Merge branch '8.0' into 8.1

* 8.0:
  Add a merge-up skill for contributors
  [Contracts] Fix SubscribedService $type phpdoc to allow non-class strings

Author: fabpot

Attribute/SubscribedService.php

@@ -31,10 +31,10 @@ final class SubscribedService
     public array $attributes;
 
     /**
-     * @param string|null       $key        The key to use for the service
-     * @param class-string|null $type       The service class
-     * @param bool              $nullable   Whether the service is optional
-     * @param object|object[]   $attributes One or more dependency injection attributes to use
+     * @param string|null     $key        The key to use for the service
+     * @param string|null     $type       The service type (a class name, "string", "iterable", etc.)
+     * @param bool            $nullable   Whether the service is optional
+     * @param object|object[] $attributes One or more dependency injection attributes to use
      */
     public function __construct(
         public ?string $key = null,