[DependencyInjection] Add better return type on ContainerInterface::get()

lyrixx · lyrixx · commit efbe66522691 · 2025-04-18T17:53:49.000+02:00
diff --git a/ContainerInterface.php b/ContainerInterface.php
@@ -33,11 +33,13 @@ interface ContainerInterface extends PsrContainerInterface
     public function set(string $id, ?object $service): void;
 
     /**
+     * @template C of object
      * @template B of self::*_REFERENCE
      *
-     * @param B $invalidBehavior
+     * @param string|class-string<C> $id
+     * @param B                      $invalidBehavior
      *
-     * @psalm-return (B is self::EXCEPTION_ON_INVALID_REFERENCE|self::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE ? object : object|null)
+     * @return ($id is class-string<C> ? (B is 0|1 ? C|object : C|object|null) : (B is 0|1 ? object : object|null))
      *
      * @throws ServiceCircularReferenceException When a circular reference is detected
      * @throws ServiceNotFoundException          When the service is not defined

Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,13 @@ interface ContainerInterface extends PsrContainerInterface`
`33`	`33`	`public function set(string $id, ?object $service): void;`
`34`	`34`
`35`	`35`	`/**`
	`36`	`+ * @template C of object`
`36`	`37`	`* @template B of self::*_REFERENCE`
`37`	`38`	`*`
`38`		`- * @param B $invalidBehavior`
	`39`	`+ * @param string\|class-string<C> $id`
	`40`	`+ * @param B $invalidBehavior`
`39`	`41`	`*`
`40`		`- * @psalm-return (B is self::EXCEPTION_ON_INVALID_REFERENCE\|self::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE ? object : object\|null)`
	`42`	`+ * @return ($id is class-string<C> ? (B is 0\|1 ? C\|object : C\|object\|null) : (B is 0\|1 ? object : object\|null))`
`41`	`43`	`*`
`42`	`44`	`* @throws ServiceCircularReferenceException When a circular reference is detected`
`43`	`45`	`* @throws ServiceNotFoundException When the service is not defined`