symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/ServiceLocator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ServiceLocator.php
+3Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/ServiceLocator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ServiceLocator.php
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Symfony/Component/ErrorHandler/DebugClassLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/ErrorHandler/DebugClassLoader.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/ErrorHandler/DebugClassLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/ErrorHandler/DebugClassLoader.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Contracts/Service/ServiceProviderInterface.php
Copy file name to clipboardExpand all lines: src/Symfony/Contracts/Service/ServiceProviderInterface.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Contracts/Service/ServiceProviderInterface.php
Copy file name to clipboardExpand all lines: src/Symfony/Contracts/Service/ServiceProviderInterface.php
+1-1Lines changed: 1 addition & 1 deletion
@@ -23,6 +23,9 @@
 /**
  * @author Robin Chalas <robin.chalas@gmail.com>
  * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @template-covariant T of mixed
+ * @implements ServiceProviderInterface<T>
  */
 class ServiceLocator implements ServiceProviderInterface, \Countable
 {
 
@@ -384,7 +384,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
 
         // Detect annotations on the class
         if ($doc = $this->parsePhpDoc($refl)) {
-            $classIsTemplate = isset($doc['template']);
+            $classIsTemplate = isset($doc['template']) || isset($doc['template-covariant']);
 
             foreach (['final', 'deprecated', 'internal'] as $annotation) {
                 if (null !== $description = $doc[$annotation][0] ?? null) {
@@ -531,7 +531,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
             // To read method annotations
             $doc = $this->parsePhpDoc($method);
 
-            if (($classIsTemplate || isset($doc['template'])) && $method->hasReturnType()) {
+            if (($classIsTemplate || isset($doc['template']) || isset($doc['template-covariant'])) && $method->hasReturnType()) {
                 unset($doc['return']);
             }
 
 
@@ -19,7 +19,7 @@
  * @author Nicolas Grekas <p@tchwork.com>
  * @author Mateusz Sip <mateusz.sip@gmail.com>
  *
- * @template T of mixed
+ * @template-covariant T of mixed
  */
 interface ServiceProviderInterface extends ContainerInterface
 {
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`* @author Nicolas Grekas <p@tchwork.com>`
`20`	`20`	`* @author Mateusz Sip <mateusz.sip@gmail.com>`
`21`	`21`	`*`
`22`		`- * @template T of mixed`
	`22`	`+ * @template-covariant T of mixed`
`23`	`23`	`*/`
`24`	`24`	`interface ServiceProviderInterface extends ContainerInterface`
`25`	`25`	`{`