Merge branch '2.x' into 3.x

bkdotcom · bkdotcom · commit a220c238861e · 2025-07-13T16:43:24.000-05:00
* 2.x:
  Update phpdoc file headers
  update comment / remove extra whitespace
  fix .editorconfig
  Utility/Uri::withParsedValues() - handle null values
diff --git a/.editorconfig b/.editorconfig
@@ -1,5 +1,4 @@
-# EditorConfig:
-https://EditorConfig.org/#download
+# EditorConfig:  https://EditorConfig.org/#download
 
 root = true
 
diff --git a/src/HttpFactory/Factory.php b/src/HttpFactory/Factory.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * This file is part of HttpMessage
- *
  * @package   bdk/http-message
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2024 Brad Kent
+ * @copyright 2014-2025 Brad Kent
  * @since     2.3 since 2.3 & 3.3
  */
 
diff --git a/src/HttpMessage/AbstractStream.php b/src/HttpMessage/AbstractStream.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * This file is part of HttpMessage
- *
  * @package   bdk/http-message
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2024 Brad Kent
+ * @copyright 2020-2025 Brad Kent
  * @since     1.0
  */
 
diff --git a/src/HttpMessage/AbstractUri.php b/src/HttpMessage/AbstractUri.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * This file is part of HttpMessage
- *
  * @package   bdk/http-message
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2024 Brad Kent
+ * @copyright 2020-2025 Brad Kent
  * @since     1.0
  */
 
diff --git a/src/HttpMessage/AssertionTrait.php b/src/HttpMessage/AssertionTrait.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * This file is part of HttpMessage
- *
  * @package   bdk/http-message
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2024 Brad Kent
+ * @copyright 2020-2025 Brad Kent
  * @since     1.0
  */
 
diff --git a/src/HttpMessage/Message.php b/src/HttpMessage/Message.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * This file is part of HttpMessage
- *
  * @package   bdk/http-message
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2024 Brad Kent
+ * @copyright 2020-2025 Brad Kent
  * @since     1.0
  */
 
diff --git a/src/HttpMessage/Request.php b/src/HttpMessage/Request.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * This file is part of HttpMessage
- *
  * @package   bdk/http-message
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2024 Brad Kent
+ * @copyright 2020-2025 Brad Kent
  * @since     1.0
  */
 
diff --git a/src/HttpMessage/Response.php b/src/HttpMessage/Response.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * This file is part of HttpMessage
- *
  * @package   bdk/http-message
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2024 Brad Kent
+ * @copyright 2020-2025 Brad Kent
  * @since     1.0
  */
 
diff --git a/src/HttpMessage/ServerRequest.php b/src/HttpMessage/ServerRequest.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * This file is part of HttpMessage
- *
  * @package   bdk/http-message
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2024 Brad Kent
+ * @copyright 2020-2025 Brad Kent
  * @since     1.0
  */
 
diff --git a/src/HttpMessage/ServerRequestExtended.php b/src/HttpMessage/ServerRequestExtended.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * This file is part of HttpMessage
- *
  * @package   bdk/http-message
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2024 Brad Kent
+ * @copyright 2024-2025 Brad Kent
  * @since     1.3
  */
 
@@ -31,7 +29,7 @@ public static function fromServerRequest(ServerRequestInterface $serverRequest):
             return $serverRequest;
         }
 
-        $instance =  new static(
+        $instance = new static(
             $serverRequest->getMethod(),
             $serverRequest->getUri(),
             $serverRequest->getServerParams()
diff --git a/src/HttpMessage/ServerRequestExtendedInterface.php b/src/HttpMessage/ServerRequestExtendedInterface.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * This file is part of HttpMessage
- *
  * @package   bdk/http-message
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2024 Brad Kent
+ * @copyright 2024-2025 Brad Kent
  * @since     1.3
  */
 
@@ -173,7 +171,9 @@ public function isSecure(): bool;
     /**
      * Is this an XHR (aka ajax) request?
      *
-     * Note: This method is not part of the PSR-7 standard.
+     * Note 1: This method is not part of the PSR-7 standard.
+     * Note 2: This method likely relies on the non-standard X-Requested-With header
+     * Note 3: Javascript's fetch API does not pass any distinguishing headers
      *
      * @return bool
      */
diff --git a/src/HttpMessage/Stream.php b/src/HttpMessage/Stream.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * This file is part of HttpMessage
- *
  * @package   bdk/http-message
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2024 Brad Kent
+ * @copyright 2014-2025 Brad Kent
  * @since     1.0
  */
 
diff --git a/src/HttpMessage/UploadedFile.php b/src/HttpMessage/UploadedFile.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * This file is part of HttpMessage
- *
  * @package   bdk/http-message
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2024 Brad Kent
+ * @copyright 2014-2025 Brad Kent
  * @since     1.0
  */
 
@@ -396,7 +394,7 @@ private function assertSize($size): void
             return;
         }
         throw new InvalidArgumentException(\sprintf(
-            'Upload file size must be a positive integer.  %s provided', 
+            'Upload file size must be a positive integer.  %s provided',
             \bdk\HttpMessage\Utility\ParseStr::getDebugType($size)
         ));
     }
diff --git a/src/HttpMessage/Uri.php b/src/HttpMessage/Uri.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * This file is part of HttpMessage
- *
  * @package   bdk/http-message
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2024 Brad Kent
+ * @copyright 2014-2025 Brad Kent
  * @since     1.0
  */
 
diff --git a/src/HttpMessage/Utility/ContentType.php b/src/HttpMessage/Utility/ContentType.php
@@ -1,6 +1,14 @@
 <?php
 
-namespace bdk\HttpMessage\Utility;
+/**
+ * @package   bdk/http-message
+ * @author    Brad Kent <bkfake-github@yahoo.com>
+ * @license   http://opensource.org/licenses/MIT MIT
+ * @copyright 2023-2025 Brad Kent
+ * @since     1.0
+ */
+
+ namespace bdk\HttpMessage\Utility;
 
 /**
  * Define common mime types
diff --git a/src/HttpMessage/Utility/HttpFoundationBridge.php b/src/HttpMessage/Utility/HttpFoundationBridge.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * This file is part of HttpMessage
- *
  * @package   bdk/http-message
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2024 Brad Kent
+ * @copyright 2020-2024 Brad Kent
  * @since     1.0
  */
 
@@ -172,7 +170,7 @@ private static function getFiles(array $uploadedFiles): array
                     UPLOAD_ERR_NO_FILE
                 );
             } elseif ($value instanceof HttpFoundationUploadedFile) {
-                $value =  self::createUploadedFile($value);
+                $value = self::createUploadedFile($value);
             } elseif (\is_array($value)) {
                 $value = self::getFiles($value);
             }
diff --git a/src/HttpMessage/Utility/ParseStr.php b/src/HttpMessage/Utility/ParseStr.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * This file is part of HttpMessage
- *
  * @package   bdk/http-message
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2024 Brad Kent
+ * @copyright 2024-2025 Brad Kent
  * @since     1.0
  */
 
diff --git a/src/HttpMessage/Utility/Response.php b/src/HttpMessage/Utility/Response.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * This file is part of HttpMessage
- *
  * @package   bdk/http-message
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2024 Brad Kent
+ * @copyright 2023-2025 Brad Kent
  * @since     1.0
  */
 
diff --git a/src/HttpMessage/Utility/ServerRequest.php b/src/HttpMessage/Utility/ServerRequest.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * This file is part of HttpMessage
- *
  * @package   bdk/http-message
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2024 Brad Kent
+ * @copyright 2024-2025 Brad Kent
  * @since     1.0
  */
 
diff --git a/src/HttpMessage/Utility/Stream.php b/src/HttpMessage/Utility/Stream.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * This file is part of HttpMessage
- *
  * @package   bdk/http-message
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2024 Brad Kent
+ * @copyright 2024-2025 Brad Kent
  * @since     x.3.3
  */
 
diff --git a/src/HttpMessage/Utility/Uri.php b/src/HttpMessage/Utility/Uri.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * This file is part of HttpMessage
- *
  * @package   bdk/http-message
  * @author    Brad Kent <bkfake-github@yahoo.com>
  * @license   http://opensource.org/licenses/MIT MIT
- * @copyright 2014-2024 Brad Kent
+ * @copyright 2023-2025 Brad Kent
  * @since     1.0
  */
 
@@ -59,8 +57,7 @@ public static function fromGlobals(): BdkUri
      */
     public static function fromParsed(array $parsed): BdkUri
     {
-        $uri = new BdkUri();
-        return self::withParsedValues($uri, $parsed);
+        return self::withParsedValues(new BdkUri(), $parsed);
     }
 
     /**
@@ -128,8 +125,7 @@ public static function resolve(UriInterface $base, UriInterface $rel): UriInterf
         if ($rel->getScheme() !== '') {
             // rel specified scheme
             //   return rel (with path cleaned up)
-            return $rel
-                ->withPath(self::pathRemoveDots($rel->getPath()));
+            return $rel->withPath(self::pathRemoveDots($rel->getPath()));
         }
         $targetValues = array(
             'fragment' => $rel->getFragment(),
@@ -158,27 +154,27 @@ public static function resolve(UriInterface $base, UriInterface $rel): UriInterf
      * Apply component values to a Uri
      *
      * @param UriInterface $uri    UriInterface instance
-     * @param array        $parsed Component values
+     * @param array        $values Component values
      *
      * @return UriInterface
      *
      * @since x3.4
      */
     public static function withParsedValues(UriInterface $uri, array $values): UriInterface
     {
-        $uriKeys = ['fragment', 'host', 'path', 'port', 'query', 'scheme', 'userInfo'];
-        $values = \array_intersect_key(self::parsedPartsPrep($values), \array_flip($uriKeys));
-        if (\array_key_exists('path', $values) && $values['path'] === null) {
-            $values['path'] = '';
-        }
-        foreach ($values as $key => $value) {
+        $keys = ['fragment', 'host', 'path', 'port', 'query', 'scheme', 'userInfo'];
+        $nullToStringKeys = ['fragment', 'host', 'path', 'query', 'scheme'];
+        $values = \array_intersect_key(self::parsedPartsPrep($values), \array_flip($keys));
+        \array_walk($values, static function ($value, $key) use ($nullToStringKeys, &$uri) {
+            if ($value === null && \in_array($key, $nullToStringKeys, true)) {
+                $value = '';
+            }
             $method = 'with' . \ucfirst($key);
             // using call_user_func_array...  some methods (withUserInfo) accept multiple arguments
-            $args = $value === null
+            $uri = \call_user_func_array([$uri, $method], $value === null
                 ? array(null)
-                : (array) $value;
-            $uri = \call_user_func_array([$uri, $method], $args);
-        }
+                : (array) $value);
+        });
         return $uri;
     }
 
diff --git a/tests/HttpMessage/Utility/UriTest.php b/tests/HttpMessage/Utility/UriTest.php
