Fixed media trait not correctly processing non-image files.

Author: Alex Skrypnyk

src/MediaTrait.php

@@ -138,20 +138,26 @@ protected function mediaExpandEntityFields($entity_type, $stub) {
   protected function mediaExpandEntityFieldsFixtures($stub) {
     $fixture_path = $this->getMinkParameter('files_path') ? rtrim(realpath($this->getMinkParameter('files_path')), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR : NULL;
 
-    foreach (get_object_vars($stub) as $name => $value) {
+    $fields = get_object_vars($stub);
+
+    $field_types = $this->getDrupal()->getDriver()->getCore()->getEntityFieldTypes('media', array_keys($fields));
+
+    foreach ($fields as $name => $value) {
       if (strpos($name, 'field_') === FALSE) {
         continue;
       }
 
-      if (is_array($value)) {
-        if (!empty($value[0])) {
-          if (is_file($fixture_path . $value[0])) {
-            $stub->{$name}[0] = $fixture_path . $value[0];
+      if (!empty($field_types[$name]) && $field_types[$name] == 'image') {
+        if (is_array($value)) {
+          if (!empty($value[0])) {
+            if (is_file($fixture_path . $value[0])) {
+              $stub->{$name}[0] = $fixture_path . $value[0];
+            }
           }
         }
-      }
-      elseif (is_file($fixture_path . $value)) {
-        $stub->{$name} = $fixture_path . $value;
+        elseif (is_file($fixture_path . $value)) {
+          $stub->{$name} = $fixture_path . $value;
+        }
       }
     }
   }

tests/behat/features/media.feature

@@ -3,9 +3,18 @@ Feature: Check that MediaTrait works for D8 or D9
 
   @api
   Scenario: Assert "When I attach the file :file to :field_name media field"
-    Given "image" media:
-      | name       | field_media_image |
-      | Test media | example_image.png |
+    Given managed file:
+      | path                 |
+      | example_document.pdf |
+
+    And "image" media:
+      | name             | field_media_image |
+      | Test media image | example_image.png |
+    And "document" media:
+      | name                | field_media_document |
+      | Test media document | example_document.pdf |
+
     And I am logged in as a user with the "administrator" role
     When I visit "/admin/content/media"
-    Then I should see the text "Test media"
+    Then I should see the text "Test media image"
+    And I should see the text "Test media document"