1.x tweaks

Author: bkdotcom

src/HttpMessage/AssertionTrait.php

@@ -43,18 +43,22 @@ trait AssertionTrait
      * @param mixed  $value        The value to check.
      * @param string $what         The name of the value.
      * @param bool   $allowNumeric Allow float or int?
+     * @param bool   $allowNull    Allow null?
      *
      * @return void
      *
      * @throws InvalidArgumentException
      *
      * @psalm-assert string $value
      */
-    protected function assertString($value, string $what = '', bool $allowNumeric = false): void
+    protected function assertString($value, string $what = '', bool $allowNumeric = false, $allowNull = false): void
     {
         if (\is_string($value)) {
             return;
         }
+        if ($allowNull && $value === null) {
+            return;
+        }
         if ($allowNumeric && \is_numeric($value)) {
             return;
         }

src/HttpMessage/Uri.php

@@ -311,11 +311,11 @@ public function withScheme(string $scheme): UriInterface
      */
     public function withUserInfo(string $user, ?string $password = null): UriInterface
     {
-        $this->assertString($user, 'user');
+        $this->assertString($user, 'user', true);
+        $this->assertString($password, 'password', true, true);
         $userInfo = (string) $user; // for versions without type hint in method signature
         $password = (string) $password; // for versions without type hint in method signature
         if ($userInfo !== '' && $password !== '') {
-            $this->assertString($password, 'password');
             $userInfo .= ':' . $password;
         }
         if ($userInfo === $this->userInfo) {
@@ -417,7 +417,7 @@ public function withPath(string $path): UriInterface
      */
     public function withQuery(string $query): UriInterface
     {
-        $this->assertString($query, 'query');
+        $this->assertString($query, 'query', true);
         $query = $this->filterQueryAndFragment($query);
         if ($query === $this->query) {
             return $this;