Replace all instances of entity_load('image_style') and entity_load_multiple('image_style') with static method calls

I applied the patch, grepped the code and can confirm things look as they should.

+++ b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
@@ -9,6 +9,7 @@
+use Drupal\image\Entity\ImageStyle;

@@ -118,7 +119,7 @@ public function viewElements(FieldItemListInterface $items) {
-      $image_style = entity_load('image_style', $image_style_setting);
+      $image_style = ImageStyle::load($image_style_setting);

+++ b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
@@ -11,6 +11,7 @@
+use Drupal\image\Entity\ImageStyle;

@@ -176,13 +177,13 @@ public function viewElements(FieldItemListInterface $items) {
-          $image_style = entity_load('image_style', $image_style_name);
+          $image_style = ImageStyle::load($image_style_name);
...
-      $image_style = entity_load('image_style', $fallback_image_style);
+      $image_style = ImageStyle::load($fallback_image_style);

Needs to have the storage injected instead.

Also as this is changing the responsive_image module I'd like this postponed on #2271529: Move breakpoint settings to theme and module *.breakpoints.yml files at root level

Here's a re-roll adding a couple of loads that have came in since #5

Moving this to the right component :)

Made a reroll.

Something strange is happening with the tests. Drupal\\image\\Tests\\ImageAdminStylesTest::testStyle is failing even if no code is changed in a 8.0.x installation.

Updated tag to the correct one.

Stored the injected EntityStorage into the class attribute.

Patch no longer applies, tagging for reroll.

Re-rolled the patch.

Created re-roll.

This is the right patch...

.

This should fix the tests.

Rerolled. Conflict with ResponsiveImageFormatter use statements.

+++ b/core/modules/image/image.module
@@ -11,6 +11,7 @@
+use Drupal\image\Entity\ImageStyle; 

Might not be needed anymore, but I can't be sure and it's out of scope of this issue.

Patch no longer applies.

Patch submitted by the Drush iq-submit command.

Rerolled.

1. +++ b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
   @@ -66,10 +67,11 @@ class ImageFormatter extends ImageFormatterBase implements ContainerFactoryPlugi
   +    $this->imageStyleStorage = $image_style_storage;
   

   define the class variable

2. +++ b/core/modules/image/src/Tests/ImageStyleFlushTest.php
   @@ -6,6 +6,7 @@
    namespace Drupal\image\Tests;
   +use Drupal\image\Entity\ImageStyle;
   

   need blank line between

3. +++ b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
   @@ -37,6 +37,11 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
   +   * @var EntityStorageInterface
   +   */
   +  protected $imageStyleStorage;
   
   @@ -55,11 +60,14 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
   +   * @param \Drupal\Core\Entity\EntityStorageInterface $image_style_storage
   

   should be full namespaced like second one

Patch rerolled and included changes suggested by andypost.

Patch applied, and I couldn't find any instances of image_style_load() or entity_load('image_style") or their _multiple()s.

I made entity_load() and it's multiple pal throw exceptions if entity type was 'image_style' and ran unit tests. Not conclusive due to the question of coverage, but there you go.

Couldn't find out-of-scope changes.

The changes from #39 are in the interdiff but not the patch. Maybe hit the wrong commit or something?

Sorry. Patch in #40 was just a reroll. Added suggested changes now.

+++ b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
@@ -36,6 +36,13 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
+  /*
+   * The image style entity storage.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageInterface

Needs /** instead of /*

Thanks. :-)

Oops. Wonder, how that crept in :P

Fixed!

Adds container create/construct pattern to ImageFormatter and ResponsiveImageFormatter.

I couldn't find any instances of image_style_load(), entity_load('entity_style'), or entity_load_multiple('entity_style').

Reroll following #2457887: Use Utility\SafeMarkup class instead of Utility\String for placeholder(), checkPlain(),format() functions

RTBC as per #46

Thanks @LinL and @JeroenT.

entity_load() and entity_load_multiple() are not marked as deprecated, and there is no such thing as image_style_load() as far as I can see? So this is not consistent with what's in the parent issue's beta evaluation: #2225347: [META] Replace calls to ENTITY_TYPE_load() and ENTITY_TYPE_load_multiple() with static method calls Edit: I've posted a comment there.

1. +++ b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
   @@ -14,9 +14,9 @@
   +use Drupal\image\Entity\ImageStyle;
   

   Not used.

2. +++ b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
   @@ -277,6 +277,7 @@ protected function doTestResponsiveImageFieldFormatters($scheme, $empty_styles =
   +    $large_style = ImageStyle::load('large');
   

   This does not look like it is needed. The $large_style variable is populated already.

New patch with changes from #52.

Also updating issue title - image_style_load() was removed in #2190313: Add $EntityType::load() and loadMultiple() to simplify loading entities.

Thanks @xjm.

Removes all instances of entity_load('image_style') and entity_load_multiple('image_style'), addresses issues in #52.

Whether this is a prioritized change is up to the maintainer... I think it's better to be consistent with the OOP approach before release, and the work is already done anyway.

Can we get a followup to replace the use of entity_load_unchanged() in ImageAdminStylesTest?

As stated in #2225347-29: [META] Replace calls to ENTITY_TYPE_load() and ENTITY_TYPE_load_multiple() with static method calls i think that replacing calls to entity_load() etc are fine atm. Committed 1f9399f and pushed to 8.0.x. Thanks!

Created followup issue: #2471593: Replace the use of entity_load_unchanged() in ImageAdminStylesTest.