Commit 7620608f authored by Dieter Holvoet's avatar Dieter Holvoet
Browse files

Issue #3325745 by DieterHolvoet: Add Drupal 10 compatibility

parent 58669cda
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -35,14 +35,14 @@ class ApiRequestResolver implements ArgumentValueResolverInterface {
  /**
   * {@inheritdoc}
   */
  public function supports(Request $request, ArgumentMetadata $argument) {
  public function supports(Request $request, ArgumentMetadata $argument): bool {
    return is_a($argument->getType(), ApiRequestInterface::class, TRUE);
  }

  /**
   * {@inheritdoc}
   */
  public function resolve(Request $request, ArgumentMetadata $argument) {
  public function resolve(Request $request, ArgumentMetadata $argument): iterable {
    /** @var class-string<ApiRequestInterface> $requestClass */
    $requestClass = $argument->getType();

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ class ApiErrorJsonResponse extends JsonResponse {
  /**
   * {@inheritdoc}
   */
  protected function update() {
  protected function update(): static {
    return $this->setContent([
      'errors' => $this->violations,
    ]);
+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ class JsonResponse extends JsonResponseBase {
   * Create a JSON response with an array of items under the 'data' key.
   */
  public static function createWithData(array $data, int $status = 200, array $headers = []): static {
    return parent::create(['data' => $data], $status, $headers);
    return new static(['data' => $data], $status, $headers);
  }

}
+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ class PagedJsonResponse extends JsonResponse {
        ->getGeneratedUrl();
    }

    return parent::create($data, $status, $headers);
    return new static($data, $status, $headers);
  }

}