Merge pull request #797 from rogervila/psalm-5

driehle · web-flow · commit ad346200568a · 2022-12-12T16:24:40.000+01:00
Psalm 5 Support
diff --git a/composer.json b/composer.json
@@ -72,7 +72,7 @@
         "phpstan/phpstan-phpunit": "^1.3.0",
         "phpunit/phpunit": "^9.5.27",
         "predis/predis": "^1.1.10",
-        "vimeo/psalm": "^4.30.0"
+        "vimeo/psalm": "^5.0"
     },
     "conflict": {
         "doctrine/orm": "2.12.0"
diff --git a/src/Paginator/Adapter/Collection.php b/src/Paginator/Adapter/Collection.php
@@ -13,6 +13,7 @@
 /**
  * @psalm-template TKey of array-key
  * @psalm-template T
+ * @template-implements AdapterInterface<int, T>
  */
 class Collection implements AdapterInterface
 {
diff --git a/src/Paginator/Adapter/Selectable.php b/src/Paginator/Adapter/Selectable.php
@@ -15,6 +15,7 @@
  *
  * @template TKey of int
  * @template T
+ * @template-implements AdapterInterface<TKey, T>
  */
 class Selectable implements AdapterInterface
 {

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`/**`
`14`	`14`	`* @psalm-template TKey of array-key`
`15`	`15`	`* @psalm-template T`
	`16`	`+ * @template-implements AdapterInterface<int, T>`
`16`	`17`	`*/`
`17`	`18`	`class Collection implements AdapterInterface`
`18`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`* @template TKey of int`
`17`	`17`	`* @template T`
	`18`	`+ * @template-implements AdapterInterface<TKey, T>`
`18`	`19`	`*/`
`19`	`20`	`class Selectable implements AdapterInterface`
`20`	`21`	`{`