Make Crop API compatible with core Media

Here two patches, for 1.x branch (Rétro compatible with Media Entity) and 2.x fully compatible with Media.

Here you are 1.x fixes and some coding standards fixes by the way...

+++ b/src/Plugin/Crop/EntityProvider/Media.php
@@ -59,9 +59,12 @@ class MediaEntity extends EntityProviderBase implements ContainerFactoryPluginIn
-    /** @var \Drupal\media_entity\MediaBundleInterface $bundle */
-    $bundle = $this->entityTypeManager->getStorage('media_bundle')->load($entity->bundle());
-    $image_field = $bundle->getThirdPartySetting('crop', 'image_field');
+
+    $bundle_entity_type = $entity->getEntityType()->getBundleEntityType();
+    /** @var \Drupal\Core\Config\Entity\ConfigEntityBase $entity_type */
+    $entity_type = $this->entityTypeManager->getStorage($bundle_entity_type)->load($entity->bundle());
+
+    $image_field = $entity_type->getThirdPartySetting('crop', 'image_field');

This way is better and reduce general complexity.

As discussed with @slashrsm

In that provider the idea was that you could have crops that are tied to different entities. This way you could say for node N crop like this and for node M like this but then we realized that the image style system can't do that so it was a good idea I guess but can't be used right now.

I maintain that provider and permit this method can retrieve $entity_type from ContentEntityType. We can't retrieve directly the Entity Type loaded directly we need to use EntityManager to do that.

Typo/Nit/coding standards fixes backported onto 2-x patch and change backported for \Drupal\crop\Plugin\Crop\EntityProvider\Media::uri

To test providers here small code to past in devel console :

$plugin_manager = \Drupal::service('plugin.manager.crop.entity_provider');
$plugin_media = $plugin_manager->createInstance('media');
$media_entity = \Drupal::entityTypeManager()->getStorage('media')->load(1);
dpm($plugin_media->uri($media_entity));

Backport of https://www.drupal.org/node/2808719#comment-12314321 change for 2.x branch to assume empty value for crop configuration form.

Re-roll of patch for 1.x branch and small addition to display element in correct form element group.
Small addition of form element group for 2.x patch.

Everything look's good now :).

Edit : @phenaproxima : I have juste one doubt about move submodule into crop basis for Media cropProvider "modules/crop_media_entity/src/Plugin/Crop/EntityProvider/MediaEntity.php" If users have this module enabled we need to add update_n to uninstall "crop_media_entity" on update no ?

Re-roll patches head of last release (1.x) / beta-1 (2.x)

@phenaproxima :O I'm surprised I didn't see this change in patches ! This look like a custom check I have added to debug in my test install but does not appear here :O We are right this doesn't applied at all But with patches apply I didn't see

/**
 * Prepares variables for crop_crop summary template.
 *
 * Default template: crop-crop-summary.twig.html.
 */
function template_preprocess_crop_crop_summary(&$variables) {
  if (!empty($variables['data']['crop_type'])) {
    $type = \Drupal::entityTypeManager()->getStorage('crop_type')->load($variables['data']['crop_type']);
    $variables['data']['crop_type'] = $type->label();
  }
}

This check only exist on _crop_media_provider_form() function and that's only fired if we use Media entity of Media in core Both module implement same form_alter() and we need to be sure what entity builder you should process. If current media are MediaType then First condition are OK else we are in Media entity context.

This form_alter does not create a strong dependency to media entity / media core but this is only a way to avoid code duplications in 1.x branch. We need to permit using Media Entity Or Media core.

Perhaps this opportunity to bring both lives to you and you prefer a more radical approach? In this case the addition of a conflict in the composer.json would not hurt to empower users to the fact that 1.x === Media entity 2.x === Media in core?

Hi @balsama,

Now Lightning seems using this patch during 6 days without problems :) That's sound good to this patch to be merged in 2.x !

The patch in #14 won't apply to the D.O packaged version of 8.x-2.x-beta1 because it patches the crop.info.yml file, and file differs in the packaged version since D.O adds some stuff. So if you want to use the patch in a project, you need to HEAD of 8.x-2.x which isn't modified by D.O.

As we have discussed on Slack, new Image Widget Crop requirements does work to use dev branch and apply patch normally now.

I switch that RTBC if anyone have objections :)

Merged Thanks all :) good job @balsama I will create PR onto Lightning as we have seen in slack.