Transfer HeaderHelper to yiisoft/http (#48)

Author: devanych

CHANGELOG.md

@@ -1,9 +1,9 @@
 # Yii Error Handler Change Log
 
-
-## 1.0.1 under development
+## 2.0.0 under development
 
 - Enh #45: Improve appearance of solution from friendly exceptions (vjik)
+- Chg #48: Transfer `HeaderHelper` to `yiisoft/http` package (devanych)
 
 ## 1.0.0 May 13, 2021
 

composer.json

@@ -29,17 +29,17 @@
         "psr/http-server-middleware": "^1.0",
         "psr/log": "^1.1",
         "yiisoft/friendly-exception": "^1.0",
-        "yiisoft/http": "^1.0",
+        "yiisoft/http": "^1.2",
         "yiisoft/injector": "^1.0"
     },
     "require-dev": {
-        "httpsoft/http-message": "^1.0.8",
+        "httpsoft/http-message": "^1.0.9",
         "phpunit/phpunit": "^9.5",
         "psr/http-server-handler": "^1.0",
-        "roave/infection-static-analysis-plugin": "^1.6",
+        "roave/infection-static-analysis-plugin": "^1.10",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.6",
-        "yiisoft/test-support": "^1.2"
+        "vimeo/psalm": "^4.12",
+        "yiisoft/test-support": "^1.3"
     },
     "autoload": {
         "psr-4": {

psalm.xml

@@ -1,15 +1,11 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="2"
-    resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
 >
     <projectFiles>
         <directory name="src" />
-        <ignoreFiles>
-            <directory name="vendor" />
-        </ignoreFiles>
     </projectFiles>
 </psalm>

src/HeaderHelper.php

@@ -13,14 +13,14 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use Throwable;
 use Yiisoft\ErrorHandler\ErrorHandler;
-use Yiisoft\ErrorHandler\HeaderHelper;
 use Yiisoft\ErrorHandler\Renderer\HeaderRenderer;
 use Yiisoft\ErrorHandler\Renderer\HtmlRenderer;
 use Yiisoft\ErrorHandler\Renderer\JsonRenderer;
 use Yiisoft\ErrorHandler\Renderer\PlainTextRenderer;
 use Yiisoft\ErrorHandler\Renderer\XmlRenderer;
 use Yiisoft\ErrorHandler\ThrowableRendererInterface;
 use Yiisoft\Http\Header;
+use Yiisoft\Http\HeaderValueHelper;
 use Yiisoft\Http\Method;
 use Yiisoft\Http\Status;
 
@@ -183,7 +183,7 @@ private function getRenderer(string $contentType): ?ThrowableRendererInterface
     private function getContentType(ServerRequestInterface $request): string
     {
         try {
-            foreach (HeaderHelper::getSortedAcceptTypes($request->getHeader(Header::ACCEPT)) as $header) {
+            foreach (HeaderValueHelper::getSortedAcceptTypes($request->getHeader(Header::ACCEPT)) as $header) {
                 if (array_key_exists($header, $this->renderers)) {
                     return $header;
                 }

src/Middleware/ErrorCatcher.php

@@ -388,6 +388,7 @@ private function renderTemplate(string $path, array $parameters): string
 
         $obInitialLevel = ob_get_level();
         ob_start();
+        /** @psalm-suppress InvalidArgument */
         PHP_VERSION_ID >= 80000 ? ob_implicit_flush(false) : ob_implicit_flush(0);
 
         try {