PR feedback changes.

src/GraphQL/Response/Response.php

@@ -27,7 +27,7 @@ public function addViolation($message, array $properties = []): void {
   /**
    * {@inheritdoc}
    */
-  public function addViolations($messages, array $properties = []): void {
+  public function addViolations(array $messages, array $properties = []): void {
     foreach ($messages as $message) {
       $this->addViolation($message, $properties);
     }

src/GraphQL/Response/ResponseInterface.php

@@ -4,8 +4,6 @@
 
 namespace Drupal\graphql\GraphQL\Response;
 
-use Symfony\Component\Validator\ConstraintViolationListInterface;
-
 /**
  * Response interface used for GraphQL responses.
  */
@@ -14,7 +12,7 @@ interface ResponseInterface {
   /**
    * Adds the violation.
    *
-   * @param string|\Drupal\Core\StringTranslation\TranslatableMarkup|\Symfony\Component\Validator\ConstraintViolationListInterface $message
+   * @param string|\Drupal\Core\StringTranslation\TranslatableMarkup $message
    *   Violation message.
    * @param array $properties
    *   Other properties related to the violation.
@@ -24,12 +22,12 @@ public function addViolation($message, array $properties = []): void;
   /**
    * Adds multiple violations.
    *
-   * @param string[]|\Drupal\Core\StringTranslation\TranslatableMarkup[]|\Symfony\Component\Validator\ConstraintViolationListInterface $messages
+   * @param string[]|\Drupal\Core\StringTranslation\TranslatableMarkup[] $messages
    *   Violation messages.
    * @param array $properties
    *   Other properties related to the violation.
    */
-  public function addViolations(array|ConstraintViolationListInterface $messages, array $properties = []): void;
+  public function addViolations(array $messages, array $properties = []): void;
 
   /**
    * Gets the violations.

src/GraphQL/Utility/FileUpload.php

@@ -281,11 +281,13 @@ public function saveFileUpload(UploadedFile $uploaded_file, array $settings): Fi
       $file->setSize(@filesize($temp_file_path));
 
       // Validate against fileValidator first with the temporary path.
-      /** @var \Symfony\Component\Validator\ConstraintViolationListInterface $errors */
-      $errors = $this->fileValidator->validate($file, $validators);
-      if (count($errors) > 0) {
-        $response->addViolations($errors);
-        return $response;
+      /** @var \Symfony\Component\Validator\ConstraintViolationListInterface $file_validate_errors */
+      $file_validate_errors = $this->fileValidator->validate($file, $validators);
+      $errors = [];
+      if (count($file_validate_errors) > 0) {
+        foreach ($file_validate_errors as $violation) {
+          $errors[] = $violation->getMessage();
+        }
       }
 
       // Validate Image resolution.
@@ -294,11 +296,14 @@ public function saveFileUpload(UploadedFile $uploaded_file, array $settings): Fi
       if (!empty($maxResolution) || !empty($minResolution)) {
         $image_resolution_errors = $this->validateFileImageResolution($file, $maxResolution, $minResolution);
         if (!empty($image_resolution_errors)) {
-          $response->addViolations($image_resolution_errors);
-          return $response;
+          $errors = array_merge($errors, $image_resolution_errors);
         }
       }
 
+      if (!empty($errors)) {
+        $response->addViolations($errors);
+        return $response;
+      }
       $file->setFileUri($file_uri);
       // Move the file to the correct location after validation. Use
       // FileSystemInterface::EXISTS_ERROR as the file location has already been

src/Plugin/GraphQL/DataProducer/Entity/Fields/Image/ImageDerivative.php

@@ -103,7 +103,7 @@ public function resolve(FileInterface $entity = NULL, $style, RefinableCacheable
       // @phpstan-ignore-next-line
       $height = $entity->height;
 
-      if (!isset($width) || !isset($height)) {
+      if ($width == NULL || $height == NULL) {
         /** @var \Drupal\Core\Image\ImageInterface $image */
         $image = \Drupal::service('image.factory')->get($entity->getFileUri());
         if ($image->isValid()) {