Merge pull request #68 from laminas/renovate/lock-file-maintenance

Document generic types, improve internal type inference, upgrade dependencies and `vimeo/psalm`
laminas · Dec 3, 2022 · 508ebef · 508ebef
2 parents 6683d8c + 3ee6e37
commit 508ebef
Show file tree

Hide file tree

Showing 31 changed files with 640 additions and 1,587 deletions.
diff --git a/.domxpath.php.stub b/.domxpath.php.stub
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace {
+ class DOMXPath
+ {
+ /** @param non-empty-string $query */
+ public function query(string $query): DOMNodeList {}
+ }
+}
diff --git a/.gitattributes b/.gitattributes
@@ -1,10 +1,14 @@
 /.coveralls.yml export-ignore
+/.domxpath.php.stub export-ignore
 /.gitattributes export-ignore
 /.github/ export-ignore
 /.gitignore export-ignore
 /.travis.yml export-ignore
+/composer.lock export-ignore
 /docs/ export-ignore
 /mkdocs.yml export-ignore
 /phpcs.xml export-ignore
 /phpunit.xml.dist export-ignore
+/psalm.xml export-ignore
+/psalm-baseline.xml export-ignore
 /test/ export-ignore
diff --git a/composer.json b/composer.json
@@ -46,7 +46,7 @@
  "phpunit/phpunit": "^9.5.25",
  "psalm/plugin-phpunit": "^0.18.0",
  "psr/http-message": "^1.0.1",
- "vimeo/psalm": "^4.29"
+ "vimeo/psalm": "^5.1.0"
  },
  "conflict": {
  "laminas/laminas-servicemanager": "<3.3",

diff --git a/composer.lock b/composer.lock