diff -u b/core/modules/media/src/Plugin/media/Source/File.php b/core/modules/media/src/Plugin/media/Source/File.php --- b/core/modules/media/src/Plugin/media/Source/File.php +++ b/core/modules/media/src/Plugin/media/Source/File.php @@ -5,7 +5,6 @@ use Drupal\file\FileInterface; use Drupal\media\MediaInterface; use Drupal\media\MediaSourceBase; -use Drupal\media\MediaSourceInterface; /** * File entity media source. @@ -24,11 +23,15 @@ /** * Key for MIME type metadata attribute. + * + * @var string */ const METADATA_ATTRIBUTE_MIME = 'mime'; /** * Key for size metadata attribute. + * + * @var string */ const METADATA_ATTRIBUTE_SIZE = 'size'; @@ -60,11 +63,11 @@ return $this->getThumbnail($file) ?: parent::getMetadata($media, $name); case static::METADATA_ATTRIBUTE_MIME: - return $file->getMimeType() ?: FALSE; + return $file->getMimeType() ?: NULL; case static::METADATA_ATTRIBUTE_SIZE: $size = $file->getSize(); - return is_numeric($size) ? $size : FALSE; + return is_numeric($size) ? $size : NULL; default: return parent::getMetadata($media, $name); diff -u b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceTestBase.php b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceTestBase.php --- b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceTestBase.php +++ b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceTestBase.php @@ -108,16 +108,14 @@ ->wait(5000, "jQuery('.machine-name-value').text() === '{$media_type_id}'"); // Make sure the source is available. - $this->assertSession()->fieldExists('Media source'); - $this->assertSession()->optionExists('Media source', $source_id); + $assert_session->fieldExists('Media source'); + $assert_session->optionExists('Media source', $source_id); $page->selectFieldOption('Media source', $source_id); $assert_session->assertWaitOnAjaxRequest(); // Make sure the provided fields are visible on the form. - if (!empty($provided_fields)) { - foreach ($provided_fields as $provided_field) { - $assert_session->selectExists("field_map[{$provided_field}]"); - } + foreach ($provided_fields as $provided_field) { + $assert_session->selectExists("field_map[{$provided_field}]"); } // Save the form to create the type.