Merge branch 'master' into solution

Author: xepozz

.github/workflows/bc.yml

@@ -30,4 +30,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0']
+        ['8.1']

.github/workflows/build.yml

@@ -31,4 +31,4 @@ jobs:
       os: >-
         ['ubuntu-latest', 'windows-latest']
       php: >-
-        ['8.0', '8.1', '8.2', '8.3']
+        ['8.1', '8.2', '8.3', '8.4']

.github/workflows/composer-require-checker.yml

@@ -31,4 +31,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1', '8.2', '8.3']
+        ['8.1', '8.2', '8.3', '8.4']

.github/workflows/rector.yml

@@ -21,4 +21,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.3']
+        ['8.4']

.github/workflows/static.yml

@@ -29,12 +29,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1', '8.2', '8.3']
-  psalm80:
-    uses: yiisoft/actions/.github/workflows/psalm.yml@master
-    with:
-      psalm-config: psalm80.xml
-      os: >-
-        ['ubuntu-latest']
-      php: >-
-        ['8.0']
+        ['8.1', '8.2', '8.3', '8.4']

.gitignore

@@ -16,9 +16,7 @@ Thumbs.db
 composer.phar
 composer.lock
 
-# phpunit itself is not needed
-phpunit.phar
-# local phpunit config
+# PHPUnit
+/phpunit.phar
 /phpunit.xml
-# phpunit cache
-.phpunit.result.cache
+/.phpunit.cache

CHANGELOG.md

@@ -1,10 +1,28 @@
 # Yii Error Handler Change Log
 
-## 3.4.0 under development
+## 4.1.1 under development
 
+- no changes in this release.
+
+## 4.1.0 April 18, 2025
+
+- New #145: Add `Yiisoft\ErrorHandler\ThrowableResponseFactory` that provides a response for `Throwable` object with
+  renderer provider usage (@vjik)
+- Chg #145: Mark `Yiisoft\ErrorHandler\Factory\ThrowableResponseFactory` as deprecated (@vjik)
+- Enh #145: Set content type header in renderers (@vjik)
+- Bug #142: Fix dark mode argument display issues (@pamparam83)
+
+## 4.0.0 February 05, 2025
+
+- Chg #137: Add separate parameters for each of `HtmlRenderer` settings in constructor. Mark `$settings` parameter as
+  deprecated (@vjik)
+- Chg #139: Change PHP constraint in `composer.json` to `~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0` (@vjik)
 - Enh #125: Add error code & show function arguments (@xepozz)
 - Enh #130: Pass exception message instead of rendered exception to logger in `ErrorHandler` (@olegbaturin)
-- Enh #133: Extract response generator from `ErrorCatcher` middleware into separate `ThrowableResponseFactory` class (@olegbaturin)
+- Enh #133: Extract response generator from `ErrorCatcher` middleware into separate `ThrowableResponseFactory`
+  class (@olegbaturin)
+- Enh #138, #139: Raise the minimum PHP version to 8.1 and minor refactoring (@vjik)
+- Bug #139: Explicitly mark nullable parameters (@vjik)
 
 ## 3.3.0 July 11, 2024
 

README.md

@@ -29,9 +29,8 @@ The package provides advanced error handling. The features are:
 
 ## Requirements
 
-- PHP 8.0 or higher.
+- PHP 8.1 or higher.
 - `DOM` PHP extension.
-- `JSON` PHP extension.
 - `mbstring` PHP extension.
 
 ## Installation
@@ -123,10 +122,11 @@ For more information about creating your own renders and examples of rendering e
 
 ### Using a factory to create a response
 
-`Yiisoft\ErrorHandler\Factory\ThrowableResponseFactory` renders `Throwable` object and produces a response according to the content type provided by the client.
+`Yiisoft\ErrorHandler\ThrowableResponseFactory` renders `Throwable` object and produces a response according to the content type provided by the client.
 
 ```php
-use Yiisoft\ErrorHandler\Factory\ThrowableResponseFactory;
+use Yiisoft\ErrorHandler\RendererProvider;
+use Yiisoft\ErrorHandler\ThrowableResponseFactory;
 
 /**
  * @var \Throwable $throwable
@@ -136,27 +136,27 @@ use Yiisoft\ErrorHandler\Factory\ThrowableResponseFactory;
  * @var \Yiisoft\ErrorHandler\ErrorHandler $errorHandler
  */
 
-$throwableResponseFactory = new ThrowableResponseFactory($responseFactory, $errorHandler, $container);
+$throwableResponseFactory = new ThrowableResponseFactory(
+    $responseFactory,
+    $errorHandler,
+    new RendererProvider\CompositeRendererProvider(
+        new RendererProvider\HeadRendererProvider(),
+        new RendererProvider\ContentTypeRendererProvider($container),
+    ),
+);
 
 // Creating an instance of the `Psr\Http\Message\ResponseInterface` with error information.
 $response = $throwableResponseFactory->create($throwable, $request);
 ```
 
-`Yiisoft\ErrorHandler\Factory\ThrowableResponseFactory` chooses how to render an exception based on accept HTTP header.
-If it's `text/html` or any unknown content type, it will use the error or exception HTML template to display errors.
-For other mime types, the error handler will choose different renderer that is registered within the error catcher.
-By default, JSON, XML and plain text are supported. You can change this behavior as follows:
+`Yiisoft\ErrorHandler\ThrowableResponseFactory` chooses how to render an exception by renderer provider. Providers
+available out of the box:
 
-```php
-// Returns a new instance without renderers by the specified content types.
-$throwableResponseFactory = $throwableResponseFactory->withoutRenderers('application/xml', 'text/xml');
-
-// Returns a new instance with the specified content type and renderer class.
-$throwableResponseFactory = $throwableResponseFactory->withRenderer('my/format', new MyRenderer());
-
-// Returns a new instance with the specified force content type to respond with regardless of request.
-$throwableResponseFactory = $throwableResponseFactory->forceContentType('application/json');
-```
+- `HeadRendererProvider` - renders error into HTTP headers. It is used for HEAD requests.
+- `ContentTypeRendererProvider` - renders error based on accept HTTP header. By default, JSON, XML and plain text are 
+  supported.
+- `ClosureRendererProvider` - allows you to create your own renderer provider using closures.
+- `CompositeRendererProvider` - allows you to combine several renderer providers.
 
 ### Using a middleware for catching unhandled errors
 

composer.json

@@ -31,9 +31,8 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "ext-dom": "*",
-        "ext-json": "*",
         "ext-mbstring": "*",
         "alexkart/curl-builder": "^1.0",
         "cebe/markdown": "^1.2",
@@ -48,16 +47,16 @@
         "yiisoft/injector": "^1.0"
     },
     "require-dev": {
-        "httpsoft/http-message": "^1.0.9",
-        "maglnet/composer-require-checker": "^4.4",
-        "phpunit/phpunit": "^9.5",
+        "bamarni/composer-bin-plugin": "^1.8.2",
+        "httpsoft/http-message": "^1.1.6",
+        "phpunit/phpunit": "^10.5.45",
         "psr/event-dispatcher": "^1.0",
-        "rector/rector": "^2.0",
-        "roave/infection-static-analysis-plugin": "^1.16",
-        "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.30|^5.25",
-        "yiisoft/di": "^1.1",
-        "yiisoft/test-support": "^3.0"
+        "rector/rector": "^2.0.11",
+        "roave/infection-static-analysis-plugin": "^1.35",
+        "spatie/phpunit-watcher": "^1.24",
+        "vimeo/psalm": "^5.26.1 || ^6.9.1",
+        "yiisoft/di": "^1.3",
+        "yiisoft/test-support": "^3.0.2"
     },
     "autoload": {
         "psr-4": {
@@ -70,6 +69,11 @@
         }
     },
     "extra": {
+        "bamarni-bin": {
+            "bin-links": true,
+            "target-directory": "tools",
+            "forward-command": true
+        },
         "config-plugin-options": {
             "source-directory": "config"
         },
@@ -81,8 +85,9 @@
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-            "infection/extension-installer": true,
-            "composer/package-versions-deprecated": true
+            "bamarni/composer-bin-plugin": true,
+            "composer/package-versions-deprecated": true,
+            "infection/extension-installer": true
         }
     },
     "scripts": {

phpunit.xml.dist

@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="vendor/autoload.php"
-         colors="true"
-         verbose="true"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         cacheDirectory=".phpunit.cache"
+         requireCoverageMetadata="false"
+         beStrictAboutCoverageMetadata="true"
+         beStrictAboutOutputDuringTests="true"
+         executionOrder="random"
          failOnRisky="true"
          failOnWarning="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
+         failOnDeprecation="true"
          stopOnFailure="false"
-         executionOrder="random"
-         resolveDependencies="true"
+         colors="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
     <php>
-        <ini name="error_reporting" value="-1"/>
+        <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
@@ -22,9 +24,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
-            <directory>./src</directory>
+            <directory suffix=".php">./src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>