Removing hook_file_validate test module.

Author: apathak18

.github/workflows/testing.yml

@@ -13,18 +13,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # # php-versions: ['8.1', '8.2']
-        # # drupal-core: ['10.3.x']
-        # phpstan: ['0']
+        php-versions: ['8.1', '8.2']
+        drupal-core: ['10.3.x']
+        phpstan: ['0']
         include:
           # Extra run to test older supported Drupal 10.2.x.
-          # - php-versions: '8.1'
-          #   drupal-core: '10.2.x'
-          #   phpstan: '0'
+          - php-versions: '8.1'
+            drupal-core: '10.2.x'
+            phpstan: '0'
           # We only need to run PHPStan once on the latest PHP version.
-          # - php-versions: '8.3'
-          #   drupal-core: '10.3.x'
-          #   phpstan: '1'
+          - php-versions: '8.3'
+            drupal-core: '10.3.x'
+            phpstan: '1'
           - php-versions: '8.3'
             drupal-core: '11.0.x'
             phpstan: '1'

src/EventSubscriber/SubrequestSubscriber.php

@@ -67,7 +67,7 @@ public function onKernelRequestFinished(FinishRequestEvent $event): void {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents(): array {
     return [
       KernelEvents::REQUEST => 'onKernelRequest',
       KernelEvents::FINISH_REQUEST => 'onKernelRequestFinished',

src/GraphQL/Utility/FileUpload.php

@@ -37,9 +37,9 @@ class FileUpload {
   use StringTranslationTrait;
 
   /**
-   * The file storage where we will create new file entities from.
+   * The entity storage for the 'file' entity type.
    *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
+   * @var \Drupal\file\FileStorageInterface
    */
   protected $fileStorage;
 
@@ -137,7 +137,9 @@ public function __construct(
     ImageFactory $image_factory,
     FileValidatorInterface $file_validator,
   ) {
-    $this->fileStorage = $entityTypeManager->getStorage('file');
+    /** @var \Drupal\file\FileStorageInterface $file_storage */
+    $file_storage = $entityTypeManager->getStorage('file');
+    $this->fileStorage = $file_storage;
     $this->currentUser = $currentUser;
     $this->mimeTypeGuesser = $mimeTypeGuesser;
     $this->fileSystem = $fileSystem;
@@ -268,7 +270,7 @@ public function saveFileUpload(UploadedFile $uploaded_file, array $settings): Fi
 
     try {
       // Begin building file entity.
-      /** @var \Drupal\Core\Entity\EntityInterface $file */
+      /** @var \Drupal\file\FileInterface $file */
       $file = $this->fileStorage->create([]);
       $file->setOwnerId($this->currentUser->id());
       $file->setFilename($prepared_filename);
@@ -281,10 +283,11 @@ public function saveFileUpload(UploadedFile $uploaded_file, array $settings): Fi
       // Validate against fileValidator first with the temporary path.
       /** @var \Symfony\Component\Validator\ConstraintViolationListInterface $errors */
       $errors = $this->fileValidator->validate($file, $validators);
-      if (!empty($errors)) {
+      if (count($errors) > 0) {
         $response->addViolations($errors);
         return $response;
       }
+
       // Validate Image resolution.
       $maxResolution = $settings['max_resolution'] ?? 0;
       $minResolution = $settings['min_resolution'] ?? 0;
@@ -323,7 +326,6 @@ public function saveFileUpload(UploadedFile $uploaded_file, array $settings): Fi
       }
 
       $file->save();
-
       $response->setFileEntity($file);
       return $response;
     }
@@ -515,7 +517,7 @@ protected function prepareFilename(string $filename, array &$validators): string
 
         $passes_validation = FALSE;
         if (!empty($validators['FileExtension']['extensions'])) {
-          /** @var \Drupal\Core\Entity\EntityInterface $file */
+          /** @var \Drupal\file\FileInterface $file */
           $file = $this->fileStorage->create([]);
           $file->setFilename($filename);
           $passes_validation = empty($this->fileValidator->validate($file, $validators['FileExtension']['extensions']));

tests/modules/graphql_file_validate/graphql_file_validate.info.yml

@@ -114,26 +114,18 @@ public function testEmptySchemaExtensionAlteredQueryResultPropertyAdded(): void
     $this->assertSame([
       'errors' => [
         0 => [
-          'message' => 'Internal server error',
+          'message' => 'Cannot query field "empty" on type "Result".',
           'extensions' => [
-            'category' => 'internal',
+            'category' => 'graphql',
           ],
           'locations' => [
             0 => [
               'line' => 1,
               'column' => 37,
             ],
           ],
-          'path' => [
-            'alterableQuery',
-            // Reference to our variable in the error.
-            'empty',
-          ],
         ],
       ],
-      'data' => [
-        'alterableQuery' => NULL,
-      ],
     ], json_decode($result->getContent(), TRUE));
   }
 

tests/modules/graphql_file_validate/graphql_file_validate.module

@@ -15,18 +15,20 @@
  */
 class UploadFileServiceTest extends GraphQLTestBase {
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = ['file', 'graphql_file_validate'];
-
   /**
    * The FileUpload object we want to test, gets prepared in setUp().
    *
    * @var \Drupal\graphql\GraphQL\Utility\FileUpload
    */
   protected $uploadService;
 
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  protected static $modules = ['file'];
+
   /**
    * Gets the file path of the source file.
    *
@@ -67,7 +69,6 @@ public function testSuccess(): void {
       'file_directory' => 'test',
     ]);
     $file_entity = $file_upload_response->getFileEntity();
-
     $this->assertSame('public://test/test.txt', $file_entity->getFileUri());
     $this->assertFileExists($file_entity->getFileUri());
   }