Fixes

guzzle · Dec 3, 2023 · 7306aa2 · 7306aa2
1 parent 0279aa4
commit 7306aa2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 test:
 	php vendor/bin/phpunit tests/ --colors=always
 
-static: static-phpstan static-codestyle-check
+static: static-phpstan static-psalm static-codestyle-check
 
 static-phpstan:
 	composer install
@@ -13,6 +13,11 @@ static-phpstan-update-baseline:
 	composer bin phpstan update
 	$(MAKE) static-phpstan PHPSTAN_PARAMS="--generate-baseline"
 
+static-psalm:
+	composer install
+	composer bin psalm update
+	vendor/bin/psalm.phar $(PSALM_PARAMS)
+
 static-codestyle-fix:
 	composer install
 	composer bin php-cs-fixer update

diff --git a/composer.json b/composer.json
@@ -43,11 +43,11 @@
     ],
     "require": {
         "php" : "^7.2.5 || ^8.0",
-        "symfony/polyfill-php80": "^1.17"
+        "symfony/polyfill-php80": "^1.24"
     },
     "require-dev": {
-        "bamarni/composer-bin-plugin": "^1.8.1",
-        "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,6 +60,12 @@
             "GuzzleHttp\\UriTemplate\\Tests\\": "tests"
         }
     },
+    "extra": {
+        "bamarni-bin": {
+            "bin-links": true,
+            "forward-command": false
+        }
+    },
     "config": {
         "allow-plugins": {
             "bamarni/composer-bin-plugin": true

diff --git a/src/UriTemplate.php b/src/UriTemplate.php
@@ -132,7 +132,6 @@ private static function expandMatch(array $matches, array $variables): string
                 continue;
             }
 
-            /** @var mixed */
             $variable = $variables[$value['value']];
             $actuallyUseQuery = $useQuery;
             $expanded = '';