提交的内容

vendor/guzzlehttp/uri-template/CHANGELOG.md

@@ -4,6 +4,24 @@ All notable changes to `uri-template` will be documented in this file.
 
 Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## v1.0.4 - 2025-02-03
+
+### Changed
+- Officially support PHP 8.4
+
+## v1.0.3 - 2023-12-03
+
+### Changed
+- Updated link to RFC 6570
+
+## v1.0.2 - 2023-08-27
+
+### Changed
+- Officially support PHP 8.2 and 8.3
+
+### Fixed
+- Fixed using `0` as an expanded value
+
 ## v1.0.1 - 2021-10-07
 
 ### Changed

vendor/guzzlehttp/uri-template/composer.json

@@ -43,10 +43,11 @@
     ],
     "require": {
         "php" : "^7.2.5 || ^8.0",
-        "symfony/polyfill-php80": "^1.17"
+        "symfony/polyfill-php80": "^1.24"
     },
     "require-dev": {
-        "phpunit/phpunit" : "^8.5.19 || ^9.5.8",
+        "bamarni/composer-bin-plugin": "^1.8.2",
+        "phpunit/phpunit" : "^8.5.36 || ^9.6.15",
         "uri-template/tests": "1.0.0"
     },
     "autoload": {
@@ -60,11 +61,15 @@
         }
     },
     "extra": {
-        "branch-alias": {
-            "dev-master": "1.0-dev"
+        "bamarni-bin": {
+            "bin-links": true,
+            "forward-command": false
         }
     },
     "config": {
+        "allow-plugins": {
+            "bamarni/composer-bin-plugin": true
+        },
         "preferred-install": "dist",
         "sort-packages": true
     }

vendor/guzzlehttp/uri-template/src/UriTemplate.php

@@ -7,7 +7,7 @@ namespace GuzzleHttp\UriTemplate;
 /**
  * Expands URI templates. Userland implementation of PECL uri_template.
  *
- * @link http://tools.ietf.org/html/rfc6570
+ * @see https://datatracker.ietf.org/doc/html/rfc6570
  */
 final class UriTemplate
 {
@@ -132,7 +132,6 @@ final class UriTemplate
                 continue;
             }
 
-            /** @var mixed */
             $variable = $variables[$value['value']];
             $actuallyUseQuery = $useQuery;
             $expanded = '';
@@ -170,7 +169,6 @@ final class UriTemplate
                     }
 
                     /** @var string $var */
-
                     $kvp[$key] = $var;
                 }
 
@@ -207,7 +205,7 @@ final class UriTemplate
             }
 
             if ($actuallyUseQuery) {
-                if (!$expanded && $joiner !== '&') {
+                if ($expanded === '' && $joiner !== '&') {
                     $expanded = $value['value'];
                 } else {
                     $expanded = \sprintf('%s=%s', $value['value'], $expanded);