Upgrade framework

vendor/symfony/http-kernel/Event/ControllerArgumentsEvent.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Event;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * Allows filtering of controller arguments.
@@ -26,28 +26,34 @@ use Symfony\Component\HttpFoundation\Request;
  *
  * @author Christophe Coevoet <stof@notk.org>
  */
-class FilterControllerArgumentsEvent extends FilterControllerEvent
+final class ControllerArgumentsEvent extends KernelEvent
 {
-    private $arguments;
+    private $controller;
+    private array $arguments;
 
-    public function __construct(HttpKernelInterface $kernel, callable $controller, array $arguments, Request $request, $requestType)
+    public function __construct(HttpKernelInterface $kernel, callable $controller, array $arguments, Request $request, ?int $requestType)
     {
-        parent::__construct($kernel, $controller, $request, $requestType);
+        parent::__construct($kernel, $request, $requestType);
 
+        $this->controller = $controller;
         $this->arguments = $arguments;
     }
 
-    /**
-     * @return array
-     */
-    public function getArguments()
+    public function getController(): callable
+    {
+        return $this->controller;
+    }
+
+    public function setController(callable $controller)
+    {
+        $this->controller = $controller;
+    }
+
+    public function getArguments(): array
     {
         return $this->arguments;
     }
 
-    /**
-     * @param array $arguments
-     */
     public function setArguments(array $arguments)
     {
         $this->arguments = $arguments;

vendor/symfony/http-kernel/Event/ControllerEvent.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Event;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * Allows filtering of a controller callable.
@@ -25,36 +25,23 @@ use Symfony\Component\HttpFoundation\Request;
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class FilterControllerEvent extends KernelEvent
+final class ControllerEvent extends KernelEvent
 {
-    /**
-     * The current controller.
-     */
-    private $controller;
+    private string|array|object $controller;
 
-    public function __construct(HttpKernelInterface $kernel, callable $controller, Request $request, $requestType)
+    public function __construct(HttpKernelInterface $kernel, callable $controller, Request $request, ?int $requestType)
     {
         parent::__construct($kernel, $request, $requestType);
 
         $this->setController($controller);
     }
 
-    /**
-     * Returns the current controller.
-     *
-     * @return callable
-     */
-    public function getController()
+    public function getController(): callable
     {
         return $this->controller;
     }
 
-    /**
-     * Sets a new controller.
-     *
-     * @param callable $controller
-     */
-    public function setController(callable $controller)
+    public function setController(callable $controller): void
     {
         $this->controller = $controller;
     }

vendor/symfony/http-kernel/Event/ExceptionEvent.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Event;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * Allows to create a response for a thrown exception.
@@ -21,69 +21,51 @@ use Symfony\Component\HttpFoundation\Request;
  * current request. The propagation of this event is stopped as soon as a
  * response is set.
  *
- * You can also call setException() to replace the thrown exception. This
+ * You can also call setThrowable() to replace the thrown exception. This
  * exception will be thrown if no response is set during processing of this
  * event.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class GetResponseForExceptionEvent extends GetResponseEvent
+final class ExceptionEvent extends RequestEvent
 {
-    /**
-     * The exception object.
-     *
-     * @var \Exception
-     */
-    private $exception;
+    private \Throwable $throwable;
+    private bool $allowCustomResponseCode = false;
 
-    /**
-     * @var bool
-     */
-    private $allowCustomResponseCode = false;
-
-    public function __construct(HttpKernelInterface $kernel, Request $request, $requestType, \Exception $e)
+    public function __construct(HttpKernelInterface $kernel, Request $request, int $requestType, \Throwable $e)
     {
         parent::__construct($kernel, $request, $requestType);
 
-        $this->setException($e);
+        $this->setThrowable($e);
     }
 
-    /**
-     * Returns the thrown exception.
-     *
-     * @return \Exception The thrown exception
-     */
-    public function getException()
+    public function getThrowable(): \Throwable
     {
-        return $this->exception;
+        return $this->throwable;
     }
 
     /**
      * Replaces the thrown exception.
      *
      * This exception will be thrown if no response is set in the event.
-     *
-     * @param \Exception $exception The thrown exception
      */
-    public function setException(\Exception $exception)
+    public function setThrowable(\Throwable $exception): void
     {
-        $this->exception = $exception;
+        $this->throwable = $exception;
     }
 
     /**
      * Mark the event as allowing a custom response code.
      */
-    public function allowCustomResponseCode()
+    public function allowCustomResponseCode(): void
     {
         $this->allowCustomResponseCode = true;
     }
 
     /**
      * Returns true if the event allows a custom response code.
-     *
-     * @return bool
      */
-    public function isAllowingCustomResponseCode()
+    public function isAllowingCustomResponseCode(): bool
     {
         return $this->allowCustomResponseCode;
     }

vendor/symfony/http-kernel/Event/FinishRequestEvent.php

@@ -16,6 +16,6 @@ namespace Symfony\Component\HttpKernel\Event;
  *
  * @author Benjamin Eberlei <kontakt@beberlei.de>
  */
-class FinishRequestEvent extends KernelEvent
+final class FinishRequestEvent extends KernelEvent
 {
 }

vendor/symfony/http-kernel/Event/KernelEvent.php

@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\HttpKernel\Event;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Contracts\EventDispatcher\Event;
 
 /**
  * Base class for events thrown in the HttpKernel component.
@@ -22,29 +22,15 @@ use Symfony\Component\EventDispatcher\Event;
  */
 class KernelEvent extends Event
 {
-    /**
-     * The kernel in which this event was thrown.
-     *
-     * @var HttpKernelInterface
-     */
     private $kernel;
-
-    /**
-     * The request the kernel is currently processing.
-     *
-     * @var Request
-     */
     private $request;
+    private ?int $requestType;
 
     /**
-     * The request type the kernel is currently processing.  One of
-     * HttpKernelInterface::MASTER_REQUEST and HttpKernelInterface::SUB_REQUEST.
-     *
-     * @var int
+     * @param int $requestType The request type the kernel is currently processing; one of
+     *                         HttpKernelInterface::MAIN_REQUEST or HttpKernelInterface::SUB_REQUEST
      */
-    private $requestType;
-
-    public function __construct(HttpKernelInterface $kernel, Request $request, $requestType)
+    public function __construct(HttpKernelInterface $kernel, Request $request, ?int $requestType)
     {
         $this->kernel = $kernel;
         $this->request = $request;
@@ -53,20 +39,16 @@ class KernelEvent extends Event
 
     /**
      * Returns the kernel in which this event was thrown.
-     *
-     * @return HttpKernelInterface
      */
-    public function getKernel()
+    public function getKernel(): HttpKernelInterface
     {
         return $this->kernel;
     }
 
     /**
      * Returns the request the kernel is currently processing.
-     *
-     * @return Request
      */
-    public function getRequest()
+    public function getRequest(): Request
     {
         return $this->request;
     }
@@ -74,21 +56,19 @@ class KernelEvent extends Event
     /**
      * Returns the request type the kernel is currently processing.
      *
-     * @return int One of HttpKernelInterface::MASTER_REQUEST and
+     * @return int One of HttpKernelInterface::MAIN_REQUEST and
      *             HttpKernelInterface::SUB_REQUEST
      */
-    public function getRequestType()
+    public function getRequestType(): int
     {
         return $this->requestType;
     }
 
     /**
-     * Checks if this is a master request.
-     *
-     * @return bool True if the request is a master request
+     * Checks if this is the main request.
      */
-    public function isMasterRequest()
+    public function isMainRequest(): bool
     {
-        return HttpKernelInterface::MASTER_REQUEST === $this->requestType;
+        return HttpKernelInterface::MAIN_REQUEST === $this->requestType;
     }
 }

vendor/symfony/http-kernel/Event/RequestEvent.php

@@ -22,29 +22,20 @@ use Symfony\Component\HttpFoundation\Response;
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class GetResponseEvent extends KernelEvent
+class RequestEvent extends KernelEvent
 {
-    /**
-     * The response object.
-     *
-     * @var Response
-     */
-    private $response;
+    private $response = null;
 
     /**
      * Returns the response object.
-     *
-     * @return Response
      */
-    public function getResponse()
+    public function getResponse(): ?Response
     {
         return $this->response;
     }
 
     /**
      * Sets a response and stops event propagation.
-     *
-     * @param Response $response
      */
     public function setResponse(Response $response)
     {
@@ -55,10 +46,8 @@ class GetResponseEvent extends KernelEvent
 
     /**
      * Returns whether a response was set.
-     *
-     * @return bool Whether a response was set
      */
-    public function hasResponse()
+    public function hasResponse(): bool
     {
         return null !== $this->response;
     }

vendor/symfony/http-kernel/Event/ResponseEvent.php

@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\HttpKernel\Event;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * Allows to filter a Response object.
@@ -24,38 +24,23 @@ use Symfony\Component\HttpFoundation\Response;
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class FilterResponseEvent extends KernelEvent
+final class ResponseEvent extends KernelEvent
 {
-    /**
-     * The current response object.
-     *
-     * @var Response
-     */
     private $response;
 
-    public function __construct(HttpKernelInterface $kernel, Request $request, $requestType, Response $response)
+    public function __construct(HttpKernelInterface $kernel, Request $request, int $requestType, Response $response)
     {
         parent::__construct($kernel, $request, $requestType);
 
         $this->setResponse($response);
     }
 
-    /**
-     * Returns the current response object.
-     *
-     * @return Response
-     */
-    public function getResponse()
+    public function getResponse(): Response
     {
         return $this->response;
     }
 
-    /**
-     * Sets a new response object.
-     *
-     * @param Response $response
-     */
-    public function setResponse(Response $response)
+    public function setResponse(Response $response): void
     {
         $this->response = $response;
     }

vendor/symfony/http-kernel/Event/TerminateEvent.php

@@ -11,35 +11,30 @@
 
 namespace Symfony\Component\HttpKernel\Event;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * Allows to execute logic after a response was sent.
  *
- * Since it's only triggered on master requests, the `getRequestType()` method
- * will always return the value of `HttpKernelInterface::MASTER_REQUEST`.
+ * Since it's only triggered on main requests, the `getRequestType()` method
+ * will always return the value of `HttpKernelInterface::MAIN_REQUEST`.
  *
  * @author Jordi Boggiano <j.boggiano@seld.be>
  */
-class PostResponseEvent extends KernelEvent
+final class TerminateEvent extends KernelEvent
 {
     private $response;
 
     public function __construct(HttpKernelInterface $kernel, Request $request, Response $response)
     {
-        parent::__construct($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
+        parent::__construct($kernel, $request, HttpKernelInterface::MAIN_REQUEST);
 
         $this->response = $response;
     }
 
-    /**
-     * Returns the response for which this event was thrown.
-     *
-     * @return Response
-     */
-    public function getResponse()
+    public function getResponse(): Response
     {
         return $this->response;
     }

vendor/symfony/http-kernel/Event/ViewEvent.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Event;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * Allows to create a response for the return value of a controller.
@@ -23,38 +23,23 @@ use Symfony\Component\HttpFoundation\Request;
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class GetResponseForControllerResultEvent extends GetResponseEvent
+final class ViewEvent extends RequestEvent
 {
-    /**
-     * The return value of the controller.
-     *
-     * @var mixed
-     */
-    private $controllerResult;
+    private mixed $controllerResult;
 
-    public function __construct(HttpKernelInterface $kernel, Request $request, $requestType, $controllerResult)
+    public function __construct(HttpKernelInterface $kernel, Request $request, int $requestType, mixed $controllerResult)
     {
         parent::__construct($kernel, $request, $requestType);
 
         $this->controllerResult = $controllerResult;
     }
 
-    /**
-     * Returns the return value of the controller.
-     *
-     * @return mixed The controller return value
-     */
-    public function getControllerResult()
+    public function getControllerResult(): mixed
     {
         return $this->controllerResult;
     }
 
-    /**
-     * Assigns the return value of the controller.
-     *
-     * @param mixed $controllerResult The controller return value
-     */
-    public function setControllerResult($controllerResult)
+    public function setControllerResult(mixed $controllerResult): void
     {
         $this->controllerResult = $controllerResult;
     }