Merge branch 'master' into dependabot/composer/phpunit/phpunit-tw-9.6

slimphp · Jul 23, 2023 · 6b7317d · 6b7317d
2 parents 167f161 + c6dd68d
commit 6b7317d
Show file tree

Hide file tree

Showing 5 changed files with 2,284 additions and 11 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Upload coverage results to Coveralls
         if: matrix.analysis
         env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
         run: |
           composer require php-coveralls/php-coveralls -n -W
           vendor/bin/php-coveralls --coverage_clover=clover.xml -v
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
-.idea/
-.vendor/
-composer.lock
-vendor/
-/.tmp
-*.cache
+.idea/
+.vendor/
+vendor/
+/.tmp
+*.cache
diff --git a/composer.json b/composer.json
@@ -38,13 +38,13 @@
         "ext-json": "*",
         "ext-libxml": "*",
         "psr/http-factory": "^1.0",
-        "psr/http-message": "^1.0"
+        "psr/http-message": "^1.1"
     },
     "require-dev": {
         "adriansuter/php-autoload-override": "^1.4",
         "laminas/laminas-diactoros": "^2.17",
-        "nyholm/psr7": "^1.5",
-        "php-http/psr7-integration-tests": "dev-master",
+        "nyholm/psr7": "^1.7",
+        "php-http/psr7-integration-tests": "1.1.1",
         "phpstan/phpstan": "^1.9",
         "phpunit/phpunit": "^9.6",
         "squizlabs/php_codesniffer": "^3.7"