Merge pull request #805 from msmakouz/feature/default-validator

spiral · Sep 28, 2022 · 8a7ae9d · 8a7ae9d
1 parent e027a6c
commit 8a7ae9d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -28,18 +28,17 @@
     ],
     "require": {
         "php": ">=8.1",
-        "psr/http-message": "^1.0",
+        "spiral/auth": "^3.1",
         "spiral/attributes": "^2.8|^3.0",
-        "spiral/auth": "^3.0.1",
-        "spiral/core": "^3.0.1",
-        "spiral/hmvc": "^3.0.1",
-        "spiral/models": "^3.0.1",
-        "spiral/validation": "^3.0.1"
+        "spiral/core": "^3.1",
+        "spiral/models": "^3.1",
+        "spiral/validation": "^3.1",
+        "spiral/hmvc": "^3.1",
+        "psr/http-message": "^1.0"
     },
     "require-dev": {
-        "mockery/mockery": "^1.5",
-        "nyholm/psr7": "^1.5",
         "phpunit/phpunit": "^9.5.20",
+        "mockery/mockery": "^1.5",
         "vimeo/psalm": "^4.27"
     },
     "autoload": {
@@ -54,7 +53,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0.x-dev"
+            "dev-master": "3.1.x-dev"
         }
     },
     "config": {

diff --git a/src/Model/FilterDefinitionInterface.php b/src/Model/FilterDefinitionInterface.php
@@ -4,6 +4,9 @@
 
 namespace Spiral\Filters\Model;
 
+/**
+ * @template TFilterDefinition of FilterDefinitionInterface
+ */
 interface FilterDefinitionInterface
 {
     /**

diff --git a/tests/InputScopeTest.php b/tests/InputScopeTest.php
@@ -4,7 +4,7 @@
 
 namespace Spiral\Tests\Filters;
 
-use Nyholm\Psr7\ServerRequest;
+use GuzzleHttp\Psr7\ServerRequest;
 use Psr\Http\Message\ServerRequestInterface;
 use Spiral\Filter\InputScope;
 use Spiral\Filters\InputInterface;