Replace slim/psr7 with nyholm/psr7

Author: odan

composer.json

@@ -1,8 +1,7 @@
 {
     "name": "selective/validation",
-    "description": "Validation error collector and transformer",
-    "minimum-stability": "stable",
     "type": "library",
+    "description": "Validation error collector and transformer",
     "keywords": [
         "validation",
         "middleware",
@@ -13,37 +12,24 @@
     "license": "MIT",
     "require": {
         "php": "^7.2 || ^8.0",
+        "ext-json": "*",
         "psr/http-factory": "^1.0.1",
-        "psr/http-server-middleware": "^1.0.1",
-        "ext-json": "*"
+        "psr/http-server-middleware": "^1.0.1"
     },
     "require-dev": {
         "cakephp/validation": "^4.2",
         "fig/http-message-util": "^1.1",
         "friendsofphp/php-cs-fixer": "^2.16",
+        "nyholm/psr7": "^1.4",
         "overtrue/phplint": "^1.1",
         "phpstan/phpstan": "^0.12",
         "phpunit/phpunit": "^8 || ^9",
         "relay/relay": "^2.0",
         "slim/psr7": "^1",
         "squizlabs/php_codesniffer": "^3.5"
     },
-    "scripts": {
-        "check": [
-            "@lint",
-            "@cs:check",
-            "@sniffer:check",
-            "@phpstan",
-            "@test:coverage"
-        ],
-        "cs:check": "php-cs-fixer fix --dry-run --format=txt --verbose --diff --diff-format=udiff --config=.cs.php",
-        "cs:fix": "php-cs-fixer fix --config=.cs.php",
-        "lint": "phplint ./ --exclude=vendor --no-interaction --no-cache",
-        "phpstan": "phpstan analyse src --level=max -c phpstan.neon --no-progress --ansi",
-        "sniffer:check": "phpcs --standard=phpcs.xml",
-        "sniffer:fix": "phpcbf --standard=phpcs.xml",
-        "test": "phpunit --configuration phpunit.xml --do-not-cache-result",
-        "test:coverage": "phpunit --configuration phpunit.xml --do-not-cache-result --coverage-clover build/logs/clover.xml --coverage-html build/coverage"
+    "config": {
+        "sort-packages": true
     },
     "autoload": {
         "psr-4": {
@@ -55,7 +41,22 @@
             "Selective\\Validation\\Test\\": "tests/"
         }
     },
-    "config": {
-        "sort-packages": true
+    "minimum-stability": "stable",
+    "scripts": {
+        "cs:check": "php-cs-fixer fix --dry-run --format=txt --verbose --diff --diff-format=udiff --config=.cs.php",
+        "cs:fix": "php-cs-fixer fix --config=.cs.php",
+        "lint": "phplint ./ --exclude=vendor --no-interaction --no-cache",
+        "phpstan": "phpstan analyse src --level=max -c phpstan.neon --no-progress --ansi",
+        "sniffer:check": "phpcs --standard=phpcs.xml",
+        "sniffer:fix": "phpcbf --standard=phpcs.xml",
+        "test": "phpunit --configuration phpunit.xml --do-not-cache-result",
+        "test:all": [
+            "@lint",
+            "@cs:check",
+            "@sniffer:check",
+            "@phpstan",
+            "@test:coverage"
+        ],
+        "test:coverage": "php -d xdebug.mode=coverage -r \"require 'vendor/bin/phpunit';\" -- --configuration phpunit.xml --do-not-cache-result --colors=always --coverage-clover build/logs/clover.xml --coverage-html build/coverage"
     }
 }

tests/Middleware/MiddlewareTestTrait.php

@@ -2,10 +2,10 @@
 
 namespace Selective\Validation\Test\Middleware;
 
+use Nyholm\Psr7\Factory\Psr17Factory;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Relay\Relay;
-use Slim\Psr7\Factory\ServerRequestFactory;
 
 /**
  * Test.
@@ -34,6 +34,6 @@ protected function runQueue(array $queue): ResponseInterface
      */
     protected function createRequest(): ServerRequestInterface
     {
-        return (new ServerRequestFactory())->createServerRequest('GET', '/');
+        return (new Psr17Factory())->createServerRequest('GET', '/');
     }
 }

tests/Middleware/ResponseFactoryMiddleware.php

@@ -2,11 +2,11 @@
 
 namespace Selective\Validation\Test\Middleware;
 
+use Nyholm\Psr7\Factory\Psr17Factory;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Slim\Psr7\Factory\ResponseFactory;
 
 /**
  * Middleware.
@@ -23,6 +23,6 @@ final class ResponseFactoryMiddleware implements MiddlewareInterface
      */
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        return (new ResponseFactory())->createResponse();
+        return (new Psr17Factory())->createResponse();
     }
 }

tests/Middleware/ValidationExceptionMiddlewareTest.php

@@ -3,11 +3,11 @@
 namespace Selective\Validation\Test\Middleware;
 
 use Fig\Http\Message\StatusCodeInterface;
+use Nyholm\Psr7\Factory\Psr17Factory;
 use PHPUnit\Framework\TestCase;
 use Selective\Validation\Encoder\JsonEncoder;
 use Selective\Validation\Middleware\ValidationExceptionMiddleware;
 use Selective\Validation\Transformer\ErrorDetailsResultTransformer;
-use Slim\Psr7\Factory\ResponseFactory;
 
 /**
  * Tests.
@@ -26,7 +26,7 @@ class ValidationExceptionMiddlewareTest extends TestCase
     public function testNoError(): void
     {
         $middleware = new ValidationExceptionMiddleware(
-            new ResponseFactory(),
+            new Psr17Factory(),
             new ErrorDetailsResultTransformer(),
             new JsonEncoder()
         );
@@ -47,7 +47,7 @@ public function testNoError(): void
     public function testWithError(): void
     {
         $middleware = new ValidationExceptionMiddleware(
-            new ResponseFactory(),
+            new Psr17Factory(),
             new ErrorDetailsResultTransformer(),
             new JsonEncoder()
         );
@@ -82,7 +82,7 @@ public function testWithError(): void
     public function testWithCustomStatusCode(): void
     {
         $middleware = new ValidationExceptionMiddleware(
-            new ResponseFactory(),
+            new Psr17Factory(),
             new ErrorDetailsResultTransformer(),
             new JsonEncoder()
         );