Add conditional return types

wouterj · wouterj · commit b75382775c7c · 2022-07-21T18:15:55.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1440,6 +1440,7 @@ public function getProtocolVersion(): ?string
      * @param bool $asResource If true, a resource will be returned
      *
      * @return string|resource
+     * @psalm-return ($asResource is true ? resource : string)
      */
     public function getContent(bool $asResource = false)
     {
diff --git a/src/Symfony/Component/Messenger/Envelope.php b/src/Symfony/Component/Messenger/Envelope.php
@@ -106,7 +106,13 @@ public function last(string $stampFqcn): ?StampInterface
     }
 
     /**
+     * @template TStamp of StampInterface
+     *
+     * @param class-string<TStamp>|null $stampFqcn
+     *
      * @return StampInterface[]|StampInterface[][] The stamps for the specified FQCN, or all stamps by their class name
+     *
+     * @psalm-return ($stampFqcn is string ? list<TStamp> : array<class-string<StampInterface>, list<StampInterface>>)
      */
     public function all(string $stampFqcn = null): array
     {
diff --git a/src/Symfony/Component/Serializer/SerializerInterface.php b/src/Symfony/Component/Serializer/SerializerInterface.php
@@ -19,14 +19,21 @@ interface SerializerInterface
     /**
      * Serializes data in the appropriate format.
      *
-     * @param mixed  $data    Any data
-     * @param string $format  Format name
-     * @param array  $context Options normalizers/encoders have access to
+     * @param $data    Any data
+     * @param $format  Format name
+     * @param $context Options normalizers/encoders have access to
      */
     public function serialize(mixed $data, string $format, array $context = []): string;
 
     /**
      * Deserializes data into the given type.
+     *
+     * @template TObject of object
+     * @template TType of string|class-string<TObject>
+     *
+     * @param TType of $type
+     *
+     * @return (TType is class-string<TObject> ? TObject : mixed)
      */
     public function deserialize(mixed $data, string $type, string $format, array $context = []): mixed;
 }

Original file line number	Diff line number	Diff line change
`@@ -1440,6 +1440,7 @@ public function getProtocolVersion(): ?string`
`1440`	`1440`	`* @param bool $asResource If true, a resource will be returned`
`1441`	`1441`	`*`
`1442`	`1442`	`* @return string\|resource`
	`1443`	`+ * @psalm-return ($asResource is true ? resource : string)`
`1443`	`1444`	`*/`
`1444`	`1445`	`public function getContent(bool $asResource = false)`
`1445`	`1446`	`{`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,13 @@ public function last(string $stampFqcn): ?StampInterface`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`/**`
	`109`	`+ * @template TStamp of StampInterface`
	`110`	`+ *`
	`111`	`+ * @param class-string<TStamp>\|null $stampFqcn`
	`112`	`+ *`
`109`	`113`	`* @return StampInterface[]\|StampInterface[][] The stamps for the specified FQCN, or all stamps by their class name`
	`114`	`+ *`
	`115`	`+ * @psalm-return ($stampFqcn is string ? list<TStamp> : array<class-string<StampInterface>, list<StampInterface>>)`
`110`	`116`	`*/`
`111`	`117`	`public function all(string $stampFqcn = null): array`
`112`	`118`	`{`