Upgrade actions/checkout and SA tools (#25)

* Upgrade actions/checkout and SA tools * Fixes * Update Makefile
guzzle · Dec 3, 2023 · ecea8fe · ecea8fe
1 parent 3584e81
commit ecea8fe
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 17 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Composer normalize
         uses: docker://ergebnis/composer-normalize-action
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
           extensions: mbstring
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install dependencies
         run: composer update --no-interaction --prefer-stable --prefer-lowest --no-progress
@@ -46,7 +46,7 @@ jobs:
           extensions: mbstring
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install dependencies
         run: composer update --no-interaction --no-progress

diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -39,7 +39,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -63,7 +63,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

diff --git a/Makefile b/Makefile
@@ -1,17 +1,17 @@
 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
 	composer bin phpstan update
 	vendor/bin/phpstan analyze $(PHPSTAN_PARAMS)
 
-static-phpstan-update-baseline:
+static-psalm:
 	composer install
-	composer bin phpstan update
-	$(MAKE) static-phpstan PHPSTAN_PARAMS="--generate-baseline"
+	composer bin psalm update
+	vendor/bin/psalm.phar $(PSALM_PARAMS)
 
 static-codestyle-fix:
 	composer install

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 = '';

diff --git a/vendor-bin/php-cs-fixer/composer.json b/vendor-bin/php-cs-fixer/composer.json
@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.4 || ^8.0",
-        "friendsofphp/php-cs-fixer": "3.23.0"
+        "friendsofphp/php-cs-fixer": "3.40.2"
     },
     "config": {
         "preferred-install": "dist"

diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json
@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.4 || ^8.0",
-        "phpstan/phpstan": "1.10.32",
+        "phpstan/phpstan": "1.10.47",
         "phpstan/phpstan-deprecation-rules": "1.1.4"
     },
     "config": {

diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json
@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.4 || ^8.0",
-        "psalm/phar": "5.15.0"
+        "psalm/phar": "5.16.0"
     },
     "config": {
         "preferred-install": "dist"