Merge branch 'master' into add-error-dispatching

Author: xepozz

.styleci.yml

@@ -1,20 +1,12 @@
 preset: psr12
 risky: true
 
-version: 8
+version: 8.1
 
 finder:
   exclude:
     - docs
     - vendor
-    - resources
-    - views
-    - public
-    - templates
-  not-name:
-    - UnionCar.php
-    - TimerUnionTypes.php
-    - schema1.php
 
 enabled:
   - alpha_ordered_traits
@@ -64,7 +56,6 @@ enabled:
   - phpdoc_order
   - phpdoc_property
   - phpdoc_scalar
-  - phpdoc_separation
   - phpdoc_singular_inheritdoc
   - phpdoc_trim
   - phpdoc_trim_consecutive_blank_line_separation
@@ -86,3 +77,9 @@ enabled:
   - trailing_comma_in_multiline_array
   - unalign_double_arrow
   - unalign_equals
+  - empty_loop_body_braces
+  - integer_literal_case
+  - union_type_without_spaces
+
+disabled:
+  - function_declaration

README.md

@@ -195,7 +195,7 @@ $response = $exceptionResponder->process($request, $handler);
 In the application middleware stack `Yiisoft\ErrorHandler\Middleware\ExceptionResponder` must be placed before
 `Yiisoft\ErrorHandler\Middleware\ErrorCatcher`.
 
-For use in the [Yii framework](http://www.yiiframework.com/),
+For use in the [Yii framework](https://www.yiiframework.com/),
 see [Yii guide to handling errors](https://github.com/yiisoft/docs/blob/master/guide/en/runtime/handling-errors.md).
 
 ## Events

src/Exception/ErrorException.php

@@ -98,7 +98,7 @@ private function addXDebugTraceToFatalIfAvailable(): void
                     $frame['function'] = 'unknown';
                 }
 
-                // XDebug < 2.1.1: http://bugs.xdebug.org/view.php?id=695
+                // XDebug < 2.1.1: https://bugs.xdebug.org/view.php?id=695
                 if (!isset($frame['type']) || $frame['type'] === 'static') {
                     $frame['type'] = '::';
                 } elseif ($frame['type'] === 'dynamic') {

src/Renderer/HtmlRenderer.php

@@ -446,6 +446,7 @@ private function renderTemplate(string $path, array $parameters): string
         ob_implicit_flush(false);
 
         try {
+            /** @psalm-suppress PossiblyNullFunctionCall */
             $renderer->bindTo($this)($path, $parameters);
             return ob_get_clean();
         } catch (Throwable $e) {