BurdaMagazinOrg · chrfritsch · Dec 14, 2017
diff --git a/modules/infinite_article/config/install/field.storage.node.field_header_media.yml b/modules/infinite_article/config/install/field.storage.node.field_header_media.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - media_entity
+    - media
     - node
 id: node.field_header_media
 field_name: field_header_media

diff --git a/modules/infinite_article/config/install/field.storage.node.field_presenter_media.yml b/modules/infinite_article/config/install/field.storage.node.field_presenter_media.yml
@@ -3,7 +3,7 @@ langcode: de
 status: true
 dependencies:
   module:
-    - media_entity
+    - media
     - node
 id: node.field_presenter_media
 field_name: field_presenter_media

diff --git a/modules/infinite_article/config/optional/field.field.node.article.field_header_media.yml b/modules/infinite_article/config/optional/field.field.node.article.field_header_media.yml
@@ -3,7 +3,7 @@ status: true
 dependencies:
   config:
     - field.storage.node.field_header_media
-    - media_entity.bundle.image
+    - media.type.image
     - node.type.article
 id: node.article.field_header_media
 field_name: field_header_media

diff --git a/modules/infinite_article/config/optional/field.field.node.article.field_presenter_media.yml b/modules/infinite_article/config/optional/field.field.node.article.field_presenter_media.yml
@@ -4,7 +4,7 @@ status: true
 dependencies:
   config:
     - field.storage.node.field_presenter_media
-    - media_entity.bundle.image
+    - media.type.image
     - node.type.article
 id: node.article.field_presenter_media
 field_name: field_presenter_media

diff --git a/modules/infinite_media/config/optional/core.entity_view_display.media.image.gallery.yml b/modules/infinite_media/config/optional/core.entity_view_display.media.image.gallery.yml
@@ -9,7 +9,7 @@ dependencies:
     - field.field.media.image.field_image
     - field.field.media.image.field_source
     - field.field.media.image.field_tags
-    - media_entity.bundle.image
+    - media.type.image
   module:
     - responsive_image
     - text

diff --git a/modules/infinite_media/config/optional/core.entity_view_display.media.image.header.yml b/modules/infinite_media/config/optional/core.entity_view_display.media.image.header.yml
@@ -9,7 +9,7 @@ dependencies:
     - field.field.media.image.field_image
     - field.field.media.image.field_source
     - field.field.media.image.field_tags
-    - media_entity.bundle.image
+    - media.type.image
   module:
     - responsive_image
 id: media.image.header

diff --git a/modules/infinite_media/config/optional/core.entity_view_display.media.image.landscape_l.yml b/modules/infinite_media/config/optional/core.entity_view_display.media.image.landscape_l.yml
@@ -9,7 +9,7 @@ dependencies:
     - field.field.media.image.field_image
     - field.field.media.image.field_source
     - field.field.media.image.field_tags
-    - media_entity.bundle.image
+    - media.type.image
   module:
     - image
 id: media.image.landscape_l

diff --git a/modules/infinite_media/config/optional/core.entity_view_display.media.image.landscape_m.yml b/modules/infinite_media/config/optional/core.entity_view_display.media.image.landscape_m.yml
@@ -9,7 +9,7 @@ dependencies:
     - field.field.media.image.field_image
     - field.field.media.image.field_source
     - field.field.media.image.field_tags
-    - media_entity.bundle.image
+    - media.type.image
   module:
     - image
 id: media.image.landscape_m

diff --git a/modules/infinite_media/config/optional/core.entity_view_display.media.image.portrait_m.yml b/modules/infinite_media/config/optional/core.entity_view_display.media.image.portrait_m.yml
@@ -9,7 +9,7 @@ dependencies:
     - field.field.media.image.field_image
     - field.field.media.image.field_source
     - field.field.media.image.field_tags
-    - media_entity.bundle.image
+    - media.type.image
   module:
     - image
 id: media.image.portrait_m

diff --git a/modules/infinite_media/config/optional/core.entity_view_display.media.image.portrait_s.yml b/modules/infinite_media/config/optional/core.entity_view_display.media.image.portrait_s.yml
@@ -9,7 +9,7 @@ dependencies:
     - field.field.media.image.field_image
     - field.field.media.image.field_source
     - field.field.media.image.field_tags
-    - media_entity.bundle.image
+    - media.type.image
   module:
     - image
 id: media.image.portrait_s

diff --git a/modules/infinite_media/config/optional/core.entity_view_display.media.image.presenter_l.yml b/modules/infinite_media/config/optional/core.entity_view_display.media.image.presenter_l.yml
@@ -9,7 +9,7 @@ dependencies:
     - field.field.media.image.field_image
     - field.field.media.image.field_source
     - field.field.media.image.field_tags
-    - media_entity.bundle.image
+    - media.type.image
   module:
     - image
 id: media.image.presenter_l

diff --git a/modules/infinite_media/config/optional/core.entity_view_display.media.image.square_m.yml b/modules/infinite_media/config/optional/core.entity_view_display.media.image.square_m.yml
@@ -9,7 +9,7 @@ dependencies:
     - field.field.media.image.field_image
     - field.field.media.image.field_source
     - field.field.media.image.field_tags
-    - media_entity.bundle.image
+    - media.type.image
   module:
     - responsive_image
 id: media.image.square_m

diff --git a/modules/infinite_media/config/optional/core.entity_view_display.media.image.square_s.yml b/modules/infinite_media/config/optional/core.entity_view_display.media.image.square_s.yml
@@ -9,7 +9,7 @@ dependencies:
     - field.field.media.image.field_image
     - field.field.media.image.field_source
     - field.field.media.image.field_tags
-    - media_entity.bundle.image
+    - media.type.image
   module:
     - responsive_image
 id: media.image.square_s

diff --git a/modules/infinite_media/config/optional/core.entity_view_mode.media.gallery.yml b/modules/infinite_media/config/optional/core.entity_view_mode.media.gallery.yml
@@ -2,7 +2,7 @@ langcode: de
 status: true
 dependencies:
   module:
-    - media_entity
+    - media
 id: media.gallery
 label: Gallery
 targetEntityType: media

diff --git a/modules/infinite_media/config/optional/core.entity_view_mode.media.header.yml b/modules/infinite_media/config/optional/core.entity_view_mode.media.header.yml
@@ -2,7 +2,7 @@ langcode: de
 status: true
 dependencies:
   module:
-    - media_entity
+    - media
 id: media.header
 label: Header
 targetEntityType: media

diff --git a/modules/infinite_media/config/optional/core.entity_view_mode.media.landscape_l.yml b/modules/infinite_media/config/optional/core.entity_view_mode.media.landscape_l.yml
@@ -2,7 +2,7 @@ langcode: de
 status: true
 dependencies:
   module:
-    - media_entity
+    - media
 id: media.landscape_l
 label: 'Landscape L'
 targetEntityType: media

diff --git a/modules/infinite_media/config/optional/core.entity_view_mode.media.landscape_m.yml b/modules/infinite_media/config/optional/core.entity_view_mode.media.landscape_m.yml
@@ -2,7 +2,7 @@ langcode: de
 status: true
 dependencies:
   module:
-    - media_entity
+    - media
 id: media.landscape_m
 label: 'Landscape M'
 targetEntityType: media

diff --git a/modules/infinite_media/config/optional/core.entity_view_mode.media.portrait_m.yml b/modules/infinite_media/config/optional/core.entity_view_mode.media.portrait_m.yml
@@ -2,7 +2,7 @@ langcode: de
 status: true
 dependencies:
   module:
-    - media_entity
+    - media
 id: media.portrait_m
 label: 'Portrait M'
 targetEntityType: media

diff --git a/modules/infinite_media/config/optional/core.entity_view_mode.media.portrait_s.yml b/modules/infinite_media/config/optional/core.entity_view_mode.media.portrait_s.yml
@@ -2,7 +2,7 @@ langcode: de
 status: true
 dependencies:
   module:
-    - media_entity
+    - media
 id: media.portrait_s
 label: 'Portrait S'
 targetEntityType: media

diff --git a/modules/infinite_media/config/optional/core.entity_view_mode.media.presenter_l.yml b/modules/infinite_media/config/optional/core.entity_view_mode.media.presenter_l.yml
@@ -2,7 +2,7 @@ langcode: de
 status: true
 dependencies:
   module:
-    - media_entity
+    - media
 id: media.presenter_l
 label: 'Presenter L'
 targetEntityType: media

diff --git a/modules/infinite_media/config/optional/core.entity_view_mode.media.square_m.yml b/modules/infinite_media/config/optional/core.entity_view_mode.media.square_m.yml
@@ -2,7 +2,7 @@ langcode: de
 status: true
 dependencies:
   module:
-    - media_entity
+    - media
 id: media.square_m
 label: 'Square M'
 targetEntityType: media

diff --git a/modules/infinite_media/config/optional/core.entity_view_mode.media.square_s.yml b/modules/infinite_media/config/optional/core.entity_view_mode.media.square_s.yml
@@ -2,7 +2,7 @@ langcode: de
 status: true
 dependencies:
   module:
-    - media_entity
+    - media
 id: media.square_s
 label: 'Square S'
 targetEntityType: media

diff --git a/modules/infinite_media/config/optional/field.field.media.gallery.field_media_images.yml b/modules/infinite_media/config/optional/field.field.media.gallery.field_media_images.yml
@@ -3,8 +3,8 @@ status: true
 dependencies:
   config:
     - field.storage.media.field_media_images
-    - media_entity.bundle.gallery
-    - media_entity.bundle.image
+    - media.type.gallery
+    - media.type.image
 id: media.gallery.field_media_images
 field_name: field_media_images
 entity_type: media

diff --git a/modules/infinite_media/config/optional/field.field.media.image.field_description.yml b/modules/infinite_media/config/optional/field.field.media.image.field_description.yml
@@ -3,7 +3,7 @@ status: true
 dependencies:
   config:
     - field.storage.media.field_description
-    - media_entity.bundle.image
+    - media.type.image
   module:
     - text
 id: media.image.field_description

diff --git a/modules/infinite_media/config/optional/field.field.media.image.field_source.yml b/modules/infinite_media/config/optional/field.field.media.image.field_source.yml
@@ -3,7 +3,7 @@ status: true
 dependencies:
   config:
     - field.storage.media.field_source
-    - media_entity.bundle.image
+    - media.type.image
 id: media.image.field_source
 field_name: field_source
 entity_type: media

diff --git a/modules/infinite_media/config/optional/field.field.media.image.field_tags.yml b/modules/infinite_media/config/optional/field.field.media.image.field_tags.yml
@@ -3,7 +3,7 @@ status: true
 dependencies:
   config:
     - field.storage.media.field_tags
-    - media_entity.bundle.image
+    - media.type.image
     - taxonomy.vocabulary.tags
 id: media.image.field_tags
 field_name: field_tags

diff --git a/modules/infinite_media/config/optional/field.field.media.video.field_caption.yml b/modules/infinite_media/config/optional/field.field.media.video.field_caption.yml
@@ -3,7 +3,7 @@ status: true
 dependencies:
   config:
     - field.storage.media.field_caption
-    - media_entity.bundle.video
+    - media.type.video
   module:
     - text
 id: media.video.field_caption

diff --git a/modules/infinite_media/config/optional/field.field.media.video.field_description.yml b/modules/infinite_media/config/optional/field.field.media.video.field_description.yml
@@ -3,7 +3,7 @@ status: true
 dependencies:
   config:
     - field.storage.media.field_description
-    - media_entity.bundle.video
+    - media.type.video
   module:
     - text
 id: media.video.field_description

diff --git a/modules/infinite_media/config/optional/field.field.media.video.field_source.yml b/modules/infinite_media/config/optional/field.field.media.video.field_source.yml
@@ -3,7 +3,7 @@ status: true
 dependencies:
   config:
     - field.storage.media.field_source
-    - media_entity.bundle.video
+    - media.type.video
 id: media.video.field_source
 field_name: field_source
 entity_type: media

diff --git a/modules/infinite_media/config/optional/field.storage.media.field_caption.yml b/modules/infinite_media/config/optional/field.storage.media.field_caption.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - media_entity
+    - media
     - text
 id: media.field_caption
 field_name: field_caption

diff --git a/modules/infinite_media/config/optional/field.storage.media.field_description.yml b/modules/infinite_media/config/optional/field.storage.media.field_description.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - media_entity
+    - media
     - text
 id: media.field_description
 field_name: field_description

diff --git a/modules/infinite_media/config/optional/field.storage.media.field_media_images.yml b/modules/infinite_media/config/optional/field.storage.media.field_media_images.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - media_entity
+    - media
 id: media.field_media_images
 field_name: field_media_images
 entity_type: media

diff --git a/modules/infinite_media/config/optional/field.storage.media.field_source.yml b/modules/infinite_media/config/optional/field.storage.media.field_source.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - media_entity
+    - media
 id: media.field_source
 field_name: field_source
 entity_type: media

diff --git a/modules/infinite_media/config/optional/field.storage.media.field_tags.yml b/modules/infinite_media/config/optional/field.storage.media.field_tags.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - media_entity
+    - media
     - taxonomy
 id: media.field_tags
 field_name: field_tags

diff --git a/modules/infinite_media/infinite_media.info.yml b/modules/infinite_media/infinite_media.info.yml
@@ -12,7 +12,7 @@ dependencies:
   - image
   - inline_entity_form
   - link
-  - media_entity
+  - media
   - responsive_image
   - thunder_media
 config_devel:
@@ -95,9 +95,9 @@ config_devel:
   - image.style.square_m
   - image.style.square_s
   - image.style.square_xxs
-  - media_entity.bundle.gallery
-  - media_entity.bundle.image
-  - media_entity.bundle.video
+  - media.type.gallery
+  - media.type.image
+  - media.type.video
   - responsive_image.styles.gallery
   - responsive_image.styles.header
   - responsive_image.styles.inline

diff --git a/modules/infinite_media/infinite_media.module b/modules/infinite_media/infinite_media.module
@@ -1,10 +1,8 @@
 <?php
 
-use Drupal\Core\Image\Image;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Url;
 use Drupal\image\Entity\ImageStyle;
-use Drupal\media_entity\Entity\Media;
 
 /**
  * Implements hook_theme_suggestions_HOOK_alter().
@@ -37,7 +35,7 @@ function infinite_media_preprocess_media(&$variables) {
   }
   $variables['absolute_node_url'] = $absolute_url->toString();
 
-  /* @var Media $media */
+  /* @var \Drupal\media\Entity\Media $media */
   $media = $variables['elements']['#media'];
   $variables['media_type'] = $media->bundle();
   $variables['media_id'] = $media->id();

diff --git a/modules/infinite_media_base/infinite_media_base.info.yml b/modules/infinite_media_base/infinite_media_base.info.yml
@@ -10,7 +10,7 @@ dependencies:
   - focal_point
   - image
   - inline_entity_form
-  - media_entity
+  - media
   - responsive_image
 config_devel:
   - image.style.gallery_l
@@ -42,9 +42,9 @@ config_devel:
   - image.style.square_m
   - image.style.square_s
   - image.style.square_xxs
-  - media_entity.bundle.gallery
-  - media_entity.bundle.image
-  - media_entity.bundle.video
+  - media.type.gallery
+  - media.type.image
+  - media.type.video
   - responsive_image.styles.gallery
   - responsive_image.styles.header
   - responsive_image.styles.inline

diff --git a/modules/infinite_taxonomy/config/install/field.storage.taxonomy_term.field_header_media.yml b/modules/infinite_taxonomy/config/install/field.storage.taxonomy_term.field_header_media.yml
@@ -2,7 +2,7 @@ langcode: en
 status: true
 dependencies:
   module:
-    - media_entity
+    - media
     - taxonomy
 id: taxonomy_term.field_header_media
 field_name: field_header_media

diff --git a/...nfinite_taxonomy/config/optional/field.field.taxonomy_term.channel.field_header_media.yml b/...nfinite_taxonomy/config/optional/field.field.taxonomy_term.channel.field_header_media.yml
@@ -3,7 +3,7 @@ status: true
 dependencies:
   config:
     - field.storage.taxonomy_term.field_header_media
-    - media_entity.bundle.image
+    - media.type.image
     - taxonomy.vocabulary.channel
 id: taxonomy_term.channel.field_header_media
 field_name: field_header_media

diff --git a/...s/infinite_taxonomy/config/optional/field.field.taxonomy_term.tags.field_header_media.yml b/...s/infinite_taxonomy/config/optional/field.field.taxonomy_term.tags.field_header_media.yml
@@ -3,7 +3,7 @@ status: true
 dependencies:
   config:
     - field.storage.taxonomy_term.field_header_media
-    - media_entity.bundle.image
+    - media.type.image
     - taxonomy.vocabulary.tags
 id: taxonomy_term.tags.field_header_media
 field_name: field_header_media