Merge pull request #5 from halloverden/feature/allow-symfony-6

Feature/allow symfony 6

Author: tomme87

EventListener/ExceptionListener.php

@@ -13,34 +13,14 @@
 
 class ExceptionListener implements EventSubscriberInterface {
 
-  /**
-   * @var ExceptionConverterServiceInterface
-   */
-  private $exceptionConverterService;
-
-  /**
-   * @var ExceptionLogServiceInterface
-   */
-  private $logExceptionService;
-
-  /**
-   * @var ExceptionResponseServiceInterface
-   */
-  private $exceptionResponseService;
-
   /**
    * ExceptionListener constructor.
-   *
-   * @param ExceptionConverterServiceInterface $exceptionConverterService
-   * @param ExceptionLogServiceInterface       $logExceptionService
-   * @param ExceptionResponseServiceInterface  $exceptionResponseService
    */
-  public function __construct(ExceptionConverterServiceInterface $exceptionConverterService,
-                              ExceptionLogServiceInterface $logExceptionService,
-                              ExceptionResponseServiceInterface $exceptionResponseService) {
-    $this->exceptionConverterService = $exceptionConverterService;
-    $this->logExceptionService = $logExceptionService;
-    $this->exceptionResponseService = $exceptionResponseService;
+  public function __construct(
+    private readonly ExceptionConverterServiceInterface $exceptionConverterService,
+    private readonly ExceptionLogServiceInterface $logExceptionService,
+    private readonly ExceptionResponseServiceInterface $exceptionResponseService
+  ) {
   }
 
   /**
@@ -82,7 +62,7 @@ public function onKernelException(ExceptionEvent $event) {
   /**
    * @inheritDoc
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents(): array {
     return array(
       KernelEvents::EXCEPTION => [
         ['convertKernelException', -1],

Helpers/FlattenExceptionHelper.php

@@ -16,14 +16,14 @@
 class FlattenExceptionHelper extends FlattenException {
 
   /**
-   * @var array<int, FlattenException>
+   * @var array<int, FlattenExceptionHelper>
    */
-  private static $exceptions = [];
+  private static array $exceptions = [];
 
   /**
    * @inheritDoc
    */
-  public static function createFromThrowable(\Throwable $exception, int $statusCode = null, array $headers = []): FlattenException {
+  public static function createFromThrowable(\Throwable $exception, int $statusCode = null, array $headers = []): static {
     $id = \spl_object_id($exception);
 
     if (isset(static::$exceptions[$id])) {

Services/ExceptionResponseService.php

@@ -34,7 +34,7 @@ public function __construct(bool $debug = false) {
    */
   public function createResponseFromHttpException(HttpExceptionInterface $exception): Response {
     // Note: Encoding options needs to be set before data
-    return JsonResponse::create(null, $exception->getStatusCode(), $exception->getHeaders())
+    return (new JsonResponse(null, $exception->getStatusCode(), $exception->getHeaders()))
       ->setEncodingOptions(JsonResponse::DEFAULT_ENCODING_OPTIONS | JSON_INVALID_UTF8_IGNORE)
       ->setData($this->getData($exception));
   }

composer.json

@@ -16,12 +16,12 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php":">=7.4",
-        "symfony/http-kernel": "^v4.4.13|^5.2",
-        "symfony/dependency-injection": "^v4.4.13|^5.2",
-        "halloverden/symfony-http-exceptions": "^1.1.0",
+        "php":">=8.1",
+        "symfony/http-kernel": "^5.4|^6.1",
+        "symfony/dependency-injection": "^5.4|^6.1",
+        "halloverden/symfony-http-exceptions": "^1.0|^2.0",
         "ext-json": "*",
-        "symfony/config": "^v4.4.13|^v5.2"
+        "symfony/config": "^5.4|^6.1"
     },
     "autoload": {
         "psr-4": {