Fix implementsInterface() PHPDoc

webmozarts · Oct 5, 2022 · d31ce4b · d31ce4b
1 parent 11cb219
commit d31ce4b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/Assert.php b/src/Assert.php
@@ -1566,8 +1566,8 @@ public static function interfaceExists($value, $message = '')
     /**
      * @psalm-pure
      * @psalm-template ExpectedType of object
-     * @psalm-param class-string<ExpectedType> $interface
-     * @psalm-assert class-string<ExpectedType> $value
+     * @psalm-param class-string<ExpectedType>|ExpectedType $interface
+     * @psalm-assert class-string<ExpectedType>|ExpectedType $value
      *
      * @param mixed  $value
      * @param mixed  $interface

diff --git a/src/Mixin.php b/src/Mixin.php
@@ -4074,8 +4074,8 @@ public static function allNullOrInterfaceExists($value, $message = '')
     /**
      * @psalm-pure
      * @psalm-template ExpectedType of object
-     * @psalm-param class-string<ExpectedType> $interface
-     * @psalm-assert class-string<ExpectedType>|null $value
+     * @psalm-param class-string<ExpectedType>|ExpectedType $interface
+     * @psalm-assert class-string<ExpectedType>|ExpectedType|null $value
      *
      * @param mixed  $value
      * @param mixed  $interface
@@ -4093,8 +4093,8 @@ public static function nullOrImplementsInterface($value, $interface, $message =
     /**
      * @psalm-pure
      * @psalm-template ExpectedType of object
-     * @psalm-param class-string<ExpectedType> $interface
-     * @psalm-assert iterable<class-string<ExpectedType>> $value
+     * @psalm-param class-string<ExpectedType>|ExpectedType $interface
+     * @psalm-assert iterable<class-string<ExpectedType>|ExpectedType> $value
      *
      * @param mixed  $value
      * @param mixed  $interface
@@ -4116,8 +4116,8 @@ public static function allImplementsInterface($value, $interface, $message = '')
     /**
      * @psalm-pure
      * @psalm-template ExpectedType of object
-     * @psalm-param class-string<ExpectedType> $interface
-     * @psalm-assert iterable<class-string<ExpectedType>|null> $value
+     * @psalm-param class-string<ExpectedType>|ExpectedType $interface
+     * @psalm-assert iterable<class-string<ExpectedType>|ExpectedType|null> $value
      *
      * @param mixed  $value
      * @param mixed  $interface

diff --git a/tests/static-analysis/assert-implementsInterface.php b/tests/static-analysis/assert-implementsInterface.php
@@ -10,9 +10,9 @@
  *
  * @param mixed $value
  *
- * @return class-string<Serializable>
+ * @return Serializable|class-string<Serializable>
  */
-function implementsInterface($value): string
+function implementsInterface($value)
 {
     Assert::implementsInterface($value, Serializable::class);
 
@@ -24,9 +24,9 @@ function implementsInterface($value): string
  *
  * @param mixed $value
  *
- * @return null|class-string<Serializable>
+ * @return Serializable|class-string<Serializable>|null
  */
-function nullOrImplementsInterface($value): ?string
+function nullOrImplementsInterface($value)
 {
     Assert::nullOrImplementsInterface($value, Serializable::class);
 
@@ -38,7 +38,7 @@ function nullOrImplementsInterface($value): ?string
  *
  * @param mixed $value
  *
- * @return iterable<class-string<Serializable>>
+ * @return iterable<mixed, Serializable|class-string<Serializable>>
  */
 function allImplementsInterface($value): iterable
 {
@@ -52,7 +52,7 @@ function allImplementsInterface($value): iterable
  *
  * @param mixed $value
  *
- * @return iterable<class-string<Serializable>|null>
+ * @return iterable<mixed, Serializable|class-string<Serializable>|null>
  */
 function allNullOrImplementsInterface($value): iterable
 {