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

lyrixx · lyrixx · commit a9110ad3a582 · 2025-03-31T16:11:11.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/ContainerInterface.php b/src/Symfony/Component/DependencyInjection/ContainerInterface.php
@@ -37,7 +37,9 @@ public function set(string $id, ?object $service): void;
      *
      * @param B $invalidBehavior
      *
-     * @psalm-return (B is self::EXCEPTION_ON_INVALID_REFERENCE|self::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE ? object : object|null)
+     * @psalm-return ($id is class-string<A> ? (B is self::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE|self::EXCEPTION_ON_INVALID_REFERENCE ? A : A|null) : (B is self::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE|self::EXCEPTION_ON_INVALID_REFERENCE ? object : object|null))
+     *
+     * @return ($id is class-string<A> ? (B is 0|1 ? A : A|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
`@@ -37,7 +37,9 @@ public function set(string $id, ?object $service): void;`
`37`	`37`	`*`
`38`	`38`	`* @param B $invalidBehavior`
`39`	`39`	`*`
`40`		`- * @psalm-return (B is self::EXCEPTION_ON_INVALID_REFERENCE\|self::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE ? object : object\|null)`
	`40`	`+ * @psalm-return ($id is class-string<A> ? (B is self::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE\|self::EXCEPTION_ON_INVALID_REFERENCE ? A : A\|null) : (B is self::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE\|self::EXCEPTION_ON_INVALID_REFERENCE ? object : object\|null))`
	`41`	`+ *`
	`42`	`+ * @return ($id is class-string<A> ? (B is 0\|1 ? A : A\|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`