More type hint fixes found by static analysis

beberlei · Aug 23, 2019 · ba56167 · ba56167
1 parent dce360b
commit ba56167
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/lib/Assert/Assert.php b/lib/Assert/Assert.php
@@ -32,8 +32,8 @@ abstract class Assert
      * that is happening on the passed value.
      *
      * @param mixed $value
-     * @param string $defaultMessage
-     * @param string $defaultPropertyPath
+     * @param string|callable|null $defaultMessage
+     * @param string|null $defaultPropertyPath
      *
      * @return AssertionChain
      *
@@ -45,7 +45,7 @@ abstract class Assert
      * The assertion chain can be stateful, that means be careful when you reuse
      * it. You should never pass around the chain.
      */
-    public static function that($value, $defaultMessage = null, $defaultPropertyPath = null): AssertionChain
+    public static function that($value, $defaultMessage = null, string $defaultPropertyPath = null): AssertionChain
     {
         $assertionChain = new AssertionChain($value, $defaultMessage, $defaultPropertyPath);
 
@@ -56,12 +56,12 @@ public static function that($value, $defaultMessage = null, $defaultPropertyPath
      * Start validation on a set of values, returns {@link AssertionChain}.
      *
      * @param mixed $values
-     * @param string $defaultMessage
-     * @param string $defaultPropertyPath
+     * @param string|callable|null $defaultMessage
+     * @param string|null $defaultPropertyPath
      *
      * @return AssertionChain
      */
-    public static function thatAll($values, $defaultMessage = null, $defaultPropertyPath = null): AssertionChain
+    public static function thatAll($values, $defaultMessage = null, string $defaultPropertyPath = null): AssertionChain
     {
         return static::that($values, $defaultMessage, $defaultPropertyPath)->all();
     }
@@ -70,12 +70,12 @@ public static function thatAll($values, $defaultMessage = null, $defaultProperty
      * Start validation and allow NULL, returns {@link AssertionChain}.
      *
      * @param mixed $value
-     * @param string $defaultMessage
-     * @param string $defaultPropertyPath
+     * @param string|callable|null $defaultMessage
+     * @param string|null $defaultPropertyPath
      *
      * @return AssertionChain
      */
-    public static function thatNullOr($value, $defaultMessage = null, $defaultPropertyPath = null): AssertionChain
+    public static function thatNullOr($value, $defaultMessage = null, string $defaultPropertyPath = null): AssertionChain
     {
         return static::that($value, $defaultMessage, $defaultPropertyPath)->nullOr();
     }

diff --git a/lib/Assert/AssertionChain.php b/lib/Assert/AssertionChain.php
@@ -148,7 +148,7 @@ class AssertionChain
     /**
      * AssertionChain constructor.
      *
-     * @param $value
+     * @param mixed $value
      * @param string|callable|null $defaultMessage
      * @param string|null $defaultPropertyPath
      */