fixed tests

config/schema/stanford_media.schema.yml

@@ -86,10 +86,18 @@ field.formatter.settings.embeddable_formatter:
     max_height:
       type: integer
       label: 'Maximum height'
+    loading:
+      type: mapping
+      label: 'oEmbed loading settings'
+      mapping:
+        attribute:
+          type: string
+          label: 'Loading attribute'
     allowed_tags:
       type: string
       label: 'Allowed HTML tags'
 
+
 media.source.google_form:
   type: media.source.field_aware
   label: '"Google Form" media source configuration'

modules/media_duplicate_validation/media_duplicate_validation.info.yml

@@ -1,8 +1,8 @@
 name: 'Media Duplicate Validation'
 type: module
 description: 'Media Validation plugins to help prevent duplication of media items'
-core_version_requirement: ^9.4 || ^10
-version: 9.0.1
+core_version_requirement: ^10
+version: 10.0.0
 package: media
 dependencies:
   - drupal:media

modules/media_duplicate_validation/tests/src/Kernel/Plugin/MediaDuplicateValidation/ColorMeanTest.php

@@ -26,7 +26,7 @@ class ColorMeanTest extends MediaDuplicateValidationTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp(): void {
+  public function setup(): void {
     parent::setUp();
     $this->plugin = $this->duplicationManager->createInstance('color_mean');
   }

modules/media_duplicate_validation/tests/src/Kernel/Plugin/MediaDuplicateValidation/Md5Test.php

@@ -26,7 +26,7 @@ class Md5Test extends MediaDuplicateValidationTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp(): void {
+  public function setup(): void {
     parent::setUp();
     $this->plugin = $this->duplicationManager->createInstance('md5');
   }

modules/media_duplicate_validation/tests/src/Kernel/Plugin/MediaDuplicateValidationTestBase.php

@@ -44,7 +44,7 @@ abstract class MediaDuplicateValidationTestBase extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp(): void {
+  public function setup(): void {
     parent::setUp();
     $this->installEntitySchema('media');
     $this->installEntitySchema('file');

src/Plugin/Field/FieldFormatter/MediaResponsiveImageFormatter.php

@@ -10,8 +10,8 @@
  * @FieldFormatter (
  *   id = "media_responsive_image_formatter",
  *   label = @Translation("Media Responsive Image Style"),
- *   description = @Translation("Apply a responsive image style to image media
- *   items."), field_types = {
+ *   description = @Translation("Apply a responsive image style to image media items."),
+ *   field_types = {
  *     "entity_reference"
  *   }
  * )

stanford_media.info.yml

@@ -1,9 +1,9 @@
 name: Stanford Media
 description: Provides media module configuration and plugins.
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10
 package: media
 type: module
-version: 9.1.0
+version: 10.0.0
 dependencies:
   - dropzonejs:dropzonejs
   - drupal:breakpoint

stanford_media.module

@@ -94,17 +94,6 @@ function stanford_media_field_widget_text_textarea_form_alter(&$element, FormSta
   $element['#attached']['library'][] = 'stanford_media/admin';
 }
 
-/**
- * Implements hook_ckeditor_css_alter().
- */
-function stanford_media_ckeditor_css_alter(array &$css, Editor $editor) {
-  /** @var \Drupal\Core\Extension\ModuleExtensionList $extensions */
-  $extensions = \Drupal::service('extension.list.module');
-  // Add styles inside the ckeditor iframe.
-  $css[] = $extensions->getPath('stanford_media') . '/dist/css/stanford_media.admin.css';
-  $css[] = $extensions->getPath('stanford_media') . '/dist/css/stanford_media.css';
-}
-
 /**
  * Implements hook_theme_registry_alter().
  */

tests/src/Kernel/Form/MediaLibraryEmbeddableFormTest.php

@@ -39,7 +39,7 @@ class MediaLibraryEmbeddableFormTest extends StanfordMediaTestBase {
   /**
    * {@inheritDoc}
    */
-  protected function setUp(): void {
+  public function setup(): void {
     parent::setUp();
     $this->installConfig('media_library');
 

tests/src/Kernel/Form/MediaLibraryGoogleFormFormTest.php

@@ -23,7 +23,7 @@ class MediaLibraryGoogleFormFormTest extends StanfordMediaTestBase {
   /**
    * {@inheritDoc}
    */
-  protected function setUp(): void {
+  public function setup(): void {
     parent::setUp();
     $this->installConfig('media_library');
 

tests/src/Kernel/Form/StanfordMediaDialogFormTest.php

@@ -31,7 +31,7 @@ class StanfordMediaDialogFormTest extends StanfordMediaTestBase {
     'media_library',
     'views',
     'editor',
-    'ckeditor',
+    'ckeditor5',
     'filter',
   ];
 
@@ -49,7 +49,7 @@ public function testFormStructure() {
     FilterFormat::create(['format' => 'html', 'name' => 'test format'])->save();
     $editor = Editor::create([
       'format' => 'html',
-      'editor' => 'ckeditor',
+      'editor' => 'ckeditor5',
     ]);
     $editor->save();
     $media = Media::create(['bundle' => 'file']);

tests/src/Kernel/Plugin/Field/FieldFormatter/EmbeddableFormatterTest.php

@@ -78,7 +78,7 @@ class EmbeddableFormatterTest extends KernelTestBase {
   /**
    * {@inheritDoc}
    */
-  protected function setUp(): void {
+  public function setup(): void {
     parent::setUp();
     $this->installEntitySchema('user');
     $this->installEntitySchema('media');
@@ -106,14 +106,12 @@ protected function setUp(): void {
     ]);
     $this->mediaType->save();
 
-    $this->mediaType
-      ->set('source_configuration', [
-        'oembed_field_name' => 'field_media_embeddable_oembed',
-        'unstructured_field_name' => 'field_media_embeddable_code',
-        'thumbnails_directory' => 'public://oembed_thumbnails',
-        'source_field' => 'field_media_embeddable_oembed',
-      ])
-      ->save();
+    $this->mediaType->set('source_configuration', [
+      'oembed_field_name' => 'field_media_embeddable_oembed',
+      'unstructured_field_name' => 'field_media_embeddable_code',
+      'thumbnails_directory' => 'public://oembed_thumbnails',
+      'source_field' => 'field_media_embeddable_oembed',
+    ])->save();
 
     // Create the fields we need.
     $field_storage = FieldStorageConfig::create([
@@ -162,15 +160,13 @@ protected function setUp(): void {
     ];
 
     /** @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display */
-
     $display = EntityViewDisplay::create([
       'targetEntityType' => 'media',
       'bundle' => 'embeddable',
       'mode' => 'default',
       'status' => TRUE,
     ]);
-    $display
-      ->setComponent('field_media_embeddable_code', $display_options)
+    $display->setComponent('field_media_embeddable_code', $display_options)
       ->setComponent('field_media_embeddable_oembed', $display_options)
       ->removeComponent('thumbnail')
       ->save();
@@ -237,7 +233,6 @@ public function getMagicMethodCallback($method, $args) {
    * Formatter should not apply to things that aren't media.
    */
   public function testNonMediaField() {
-
     EntityTestBundle::create(['id' => 'test'])->save();
 
     $field_storage = FieldStorageConfig::create([
@@ -257,14 +252,12 @@ public function testNonMediaField() {
     $field_config->save();
 
     $this->assertFalse(EmbeddableFormatter::isApplicable($field_config));
-
   }
 
   /**
    * Formatter should not apply to things that aren't embeddable.
    */
   public function testOtherMediaTypeField() {
-
     $mediaType = MediaType::create([
       'id' => 'video',
       'label' => 'video',
@@ -274,7 +267,6 @@ public function testOtherMediaTypeField() {
     $source_field = $mediaType->getSource()->createSourceField($mediaType);
 
     $this->assertFalse(EmbeddableFormatter::isApplicable($source_field));
-
   }
 
   /**

tests/src/Kernel/Plugin/Field/FieldFormatter/GoogleFormFormatterTest.php

@@ -51,7 +51,7 @@ class GoogleFormFormatterTest extends KernelTestBase {
   /**
    * {@inheritDoc}
    */
-  protected function setUp(): void {
+  public function setup(): void {
     parent::setUp();
     $this->installEntitySchema('user');
     $this->installEntitySchema('media');
@@ -160,7 +160,7 @@ public function testGoogleFormatter() {
     $view_builder = \Drupal::entityTypeManager()->getViewBuilder('media');
     $display = $view_builder->view($this->media, 'default');
     $display = \Drupal::service('renderer')->renderPlain($display);
-    
+
     preg_match('/<iframe.*src="http:\/\/google.com\/forms\/a\/b\/formid\/viewform"/', $display, $matches);
     $this->assertCount(1, $matches);
     preg_match('/<iframe.*height="750".*/', $display, $matches);

tests/src/Kernel/Plugin/Field/FieldFormatter/MediaImageFormatterTest.php

@@ -35,7 +35,6 @@ class MediaImageFormatterTest extends KernelTestBase {
     'field',
     'file',
     'media',
-    'entity_reference',
   ];
 
   /**
@@ -48,7 +47,7 @@ class MediaImageFormatterTest extends KernelTestBase {
   /**
    * {@inheritDoc}
    */
-  protected function setUp(): void {
+  public function setup(): void {
     parent::setUp();
     $this->installEntitySchema('user');
     $this->installEntitySchema('node');

tests/src/Kernel/Plugin/Field/FieldFormatter/MultiMediaFormatterTest.php

@@ -36,7 +36,6 @@ class MultiMediaFormatterTest extends KernelTestBase {
     'field',
     'file',
     'media',
-    'entity_reference',
     'breakpoint',
     'responsive_image',
   ];
@@ -79,7 +78,7 @@ class MultiMediaFormatterTest extends KernelTestBase {
   /**
    * {@inheritDoc}
    */
-  protected function setUp(): void {
+  public function setup(): void {
     parent::setUp();
     $this->installEntitySchema('user');
     $this->installEntitySchema('node');

tests/src/Kernel/Plugin/Filter/MediaEmbedMarkupFilterTest.php

@@ -31,7 +31,6 @@ class MediaEmbedMarkupFilterTest extends MediaEmbedFilterTestBase {
     'system',
     'text',
     'user',
-    'entity_reference',
     'breakpoint',
     'responsive_image',
     'responsive_image_test_module',

tests/src/Kernel/Plugin/media/Source/EmbeddableTest.php

@@ -62,7 +62,7 @@ class EmbeddableTest extends KernelTestBase {
   /**
    * {@inheritDoc}
    */
-  protected function setUp(): void {
+  public function setup(): void {
 
     parent::setUp();
     $this->installEntitySchema('user');

tests/src/Kernel/Plugin/media/Source/GoogleFormTest.php

@@ -41,7 +41,7 @@ class GoogleFormTest extends KernelTestBase {
   /**
    * {@inheritDoc}
    */
-  protected function setUp(): void {
+  public function setup(): void {
     parent::setUp();
     $this->installEntitySchema('user');
     $this->installEntitySchema('media');

tests/src/Kernel/Plugin/views/field/EntityUsageLinkTest.php

@@ -38,7 +38,7 @@ class EntityUsageLinkTest extends KernelTestBase {
   /**
    * {@inheritDoc}
    */
-  protected function setUp(): void {
+  public function setup(): void {
     parent::setUp();
     $this->installEntitySchema('node');
     $this->installEntitySchema('user');

tests/src/Kernel/StanfordMediaTestBase.php

@@ -31,7 +31,7 @@ abstract class StanfordMediaTestBase extends KernelTestBase {
   /**
    * {@inheritDoc}
    */
-  protected function setUp(): void {
+  public function setup(): void {
     parent::setUp();
     $this->installEntitySchema('file');
     $this->installEntitySchema('user');

tests/src/Unit/Controller/MediaAddTest.php

@@ -10,6 +10,7 @@
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Render\RendererInterface;
+use Drupal\Core\Routing\CurrentRouteMatch;
 use Drupal\Core\Routing\UrlGeneratorInterface;
 use Drupal\Core\Utility\LinkGeneratorInterface;
 use Drupal\media\MediaTypeInterface;
@@ -40,7 +41,7 @@ class MediaAddTest extends UnitTestCase {
   /**
    * {@inheritDoc}
    */
-  protected function setUp(): void {
+  public function setup(): void {
     parent::setUp();
 
     $media_definition = $this->createMock(EntityTypeInterface::class);
@@ -75,6 +76,8 @@ protected function setUp(): void {
 
     $link_generator = $this->createMock(LinkGeneratorInterface::class);
 
+    $current_route_match = $this->createMock(CurrentRouteMatch::class);
+
     $this->container = new ContainerBuilder();
     $this->container->set('entity_type.manager', $entity_type_manager);
     $this->container->set('entity_type.bundle.info', $bundle_info);
@@ -84,7 +87,7 @@ protected function setUp(): void {
     $this->container->set('url_generator', $url_generator);
     $this->container->set('plugin.manager.bundle_suggestion_manager', $bundle_suggestion);
     $this->container->set('link_generator', $link_generator);
-
+    $this->container->set('current_route_match', $current_route_match);
     \Drupal::setContainer($this->container);
   }
 

tests/src/Unit/Form/MediaLibraryEmbeddableFormTest.php

@@ -35,7 +35,7 @@ class MediaLibraryEmbeddableFormTest extends UnitTestCase {
   /**
    * {@inheritDoc}
    */
-  protected function setUp(): void {
+  public function setup(): void {
     parent::setUp();
     $container = new ContainerBuilder();
     $container->set('string_translation', $this->getStringTranslationStub());

tests/src/Unit/Form/MediaLibraryGoogleFormFormTest.php

@@ -18,7 +18,7 @@ class MediaLibraryGoogleFormFormTest extends UnitTestCase {
   /**
    * {@inheritDoc}
    */
-  protected function setUp(): void {
+  public function setup(): void {
     parent::setUp();
     $container = new ContainerBuilder();
     $container->set('string_translation', $this->getStringTranslationStub());

tests/src/Unit/Plugin/BundleSuggestion/BundleSuggestionTestBase.php

@@ -28,7 +28,7 @@ abstract class BundleSuggestionTestBase extends UnitTestCase {
   /**
    * {@inheritDoc}
    */
-  protected function setUp(): void {
+  public function setup(): void {
     parent::setUp();
 
     $media_source = $this->createMock(MediaSourceInterface::class);

tests/src/Unit/Plugin/BundleSuggestionManagerTest.php

@@ -42,7 +42,7 @@ class BundleSuggestionManagerTest extends UnitTestCase {
   /**
    * {@inheritDoc}
    */
-  protected function setUp(): void {
+  public function setup(): void {
     parent::setUp();
     $namespaces = $this->createMock(\Traversable::class);
     $cache = $this->getCacheStub();

tests/src/Unit/Plugin/EmbedValidator/AirtableValidatorTest.php

@@ -23,7 +23,7 @@ class AirtableValidatorTest extends UnitTestCase {
   /**
    * {@inheritDoc}
    */
-  protected function setup(): void {
+  public function setup(): void {
     parent::setUp();
     $this->plugin = new AirtableValidator([], '', []);
   }

tests/src/Unit/Plugin/EmbedValidator/GoogleIframeValidatorTest.php

@@ -23,7 +23,7 @@ class GoogleIframeValidatorTest extends UnitTestCase {
   /**
    * {@inheritDoc}
    */
-  protected function setup(): void {
+  public function setup(): void {
     parent::setUp();
     $this->plugin = new GoogleIframeValidator([], '', []);
   }