10.0.0

.github/workflows/release.yml

@@ -16,8 +16,8 @@ jobs:
         uses: K-Phoen/semver-release-action@master
         with:
           release_strategy: none
-          release_branch: main
-          tag_format: "%major%.%minor%.%patch%"
+          release_branch: 10.x
+          tag_format: "10.%minor%.%patch%"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - run: echo 'Creating new release for ' ${{ steps.tag.outputs.tag }}
@@ -32,12 +32,3 @@ jobs:
           commit: ${{ github.sha }}
           generateReleaseNotes: true
           makeLatest: true
-      - uses: actions/checkout@v3
-        with:
-          ref: '9.x'
-          fetch-depth: 0
-      - name: Back to Dev
-        if: ${{ steps.tag.outputs.tag }}
-        run: |
-          composer global require su-sws/stanford-caravan:dev-8.x-3.x
-          ~/.composer/vendor/bin/sws-caravan back-to-dev ${{ steps.tag.outputs.tag }} ${{ github.workspace }} main

.github/workflows/tests.yml

@@ -25,7 +25,7 @@ jobs:
         env:
           CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
         run: |
-          composer global require su-sws/stanford-caravan:dev-8.x-3.x
+          composer global require su-sws/stanford-caravan:10.x-dev
           ~/.composer/vendor/bin/sws-caravan phpunit /var/www/html --extension-dir=$GITHUB_WORKSPACE/project --with-coverage
       - name: Save Test Results
         uses: actions/upload-artifact@v3

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Stanford Media
 
+9.1.0
+--------------------------------------------------------------------------------
+_Release Date: 2023-09-07_
+
+- Removed drupal core patch that was merged into 10.1 drupal core.
+
 9.0.1
 --------------------------------------------------------------------------------
 _Release Date: 2023-06-07_

composer.json

@@ -22,11 +22,11 @@
     "require": {
         "php": ">=8.1",
         "davidbarratt/custom-installer": "^1.1",
-        "drupal/core": "^9.4 || ^10.0",
+        "drupal/core": "^10.0",
         "drupal/dropzonejs": "^2.7",
         "drupal/entity_usage": "^2.0@beta",
         "drupal/focal_point": "^2.0@alpha",
-        "drupal/inline_entity_form": "^1.0 || ^2.0",
+        "drupal/inline_entity_form": "^2.0",
         "drupal/oembed_providers": "^2.1",
         "drupal/transliterate_filenames": "^2.0",
         "enyo/dropzone": "^5.9"
@@ -37,11 +37,7 @@
                 "enyo/dropzone"
             ]
         },
-        "patches": {
-            "drupal/core": {
-                "https://www.drupal.org/project/drupal/issues/3059955": "https://www.drupal.org/files/issues/2019-12-28/3082690-80.patch"
-            }
-        }
+        "patches": {}
     },
     "autoload": {
         "psr-4": {

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.0.1
+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');