diff --git a/core/modules/image/image.module b/core/modules/image/image.module index a6ce171..1006810 100644 --- a/core/modules/image/image.module +++ b/core/modules/image/image.module @@ -10,6 +10,7 @@ use Drupal\file\Entity\File; use Drupal\field\FieldStorageConfigInterface; use Drupal\field\FieldInstanceConfigInterface; +use Drupal\image\Entity\ImageStyle; /** * Image style constant for user presets in the database. @@ -226,7 +227,7 @@ function image_file_predelete(File $file) { * The Drupal file path to the original image. */ function image_path_flush($path) { - $styles = entity_load_multiple('image_style'); + $styles = ImageStyle::loadMultiple(); foreach ($styles as $style) { $style->flush($path); } @@ -241,7 +242,7 @@ function image_path_flush($path) { * Array of image styles both key and value are set to style name. */ function image_style_options($include_empty = TRUE) { - $styles = entity_load_multiple('image_style'); + $styles = ImageStyle::loadMultiple(); $options = array(); if ($include_empty && !empty($styles)) { $options[''] = t('- None -'); @@ -283,7 +284,7 @@ function image_style_options($include_empty = TRUE) { * - attributes: Associative array of attributes to be placed in the img tag. */ function template_preprocess_image_style(&$variables) { - $style = entity_load('image_style', $variables['style_name']); + $style = ImageStyle::load($variables['style_name']); // Determine the dimensions of the styled image. $dimensions = array( diff --git a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php index 069178d..fcc706d 100644 --- a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php +++ b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php @@ -7,8 +7,12 @@ namespace Drupal\image\Plugin\Field\FieldFormatter; +use Drupal\Core\Entity\EntityStorageInterface; +use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Plugin\ContainerFactoryPluginInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Plugin implementation of the 'image' formatter. @@ -21,7 +25,37 @@ * } * ) */ -class ImageFormatter extends ImageFormatterBase { +class ImageFormatter extends ImageFormatterBase implements ContainerFactoryPluginInterface { + + /** + * @var EntityStorageInterface + */ + protected $imageStyleStorage; + + /** + * {@inheritdoc} + */ + public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, EntityStorageInterface $image_style_storage) { + parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings); + + $this->imageStyleStorage = $image_style_storage; + } + + /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) { + return new static( + $plugin_id, + $plugin_definition, + $configuration['field_definition'], + $configuration['settings'], + $configuration['label'], + $configuration['view_mode'], + $configuration['third_party_settings'], + $container->get('entity.manager')->getStorage('image_style') + ); + } /** * {@inheritdoc} @@ -118,7 +152,7 @@ public function viewElements(FieldItemListInterface $items) { // Collect cache tags to be added for each item in the field. $cache_tags = array(); if (!empty($image_style_setting)) { - $image_style = entity_load('image_style', $image_style_setting); + $image_style = $this->imageStyleStorage->load($image_style_setting); $cache_tags = $image_style->getCacheTag(); } diff --git a/core/modules/image/src/Tests/FileMoveTest.php b/core/modules/image/src/Tests/FileMoveTest.php index 6a4454b..34c54a7 100644 --- a/core/modules/image/src/Tests/FileMoveTest.php +++ b/core/modules/image/src/Tests/FileMoveTest.php @@ -8,6 +8,7 @@ namespace Drupal\image\Tests; use Drupal\simpletest\WebTestBase; +use Drupal\image\Entity\ImageStyle; /** * Tests the file move function for images and image styles. @@ -31,7 +32,7 @@ function testNormal() { $file = entity_create('file', (array) current($this->drupalGetTestFiles('image'))); // Create derivative image. - $styles = entity_load_multiple('image_style'); + $styles = ImageStyle::loadMultiple(); $style = reset($styles); $original_uri = $file->getFileUri(); $derivative_uri = $style->buildUri($original_uri); diff --git a/core/modules/image/src/Tests/ImageAdminStylesTest.php b/core/modules/image/src/Tests/ImageAdminStylesTest.php index d998883..01f2165 100644 --- a/core/modules/image/src/Tests/ImageAdminStylesTest.php +++ b/core/modules/image/src/Tests/ImageAdminStylesTest.php @@ -8,6 +8,7 @@ namespace Drupal\image\Tests; use Drupal\image\ImageStyleInterface; +use Drupal\image\Entity\ImageStyle; /** * Tests creation, deletion, and editing of image styles and effects. @@ -123,7 +124,7 @@ function testStyle() { } // Load the saved image style. - $style = entity_load('image_style', $style_name); + $style = ImageStyle::load($style_name); // Ensure that the image style URI matches our expected path. $style_uri_path = $style->url(); $this->assertTrue(strpos($style_uri_path, $style_path) !== FALSE, 'The image style URI is correct.'); @@ -199,7 +200,7 @@ function testStyle() { $this->assertEqual($this->getImageCount($style), 0, format_string('Image style %style was flushed after renaming the style and updating the order of effects.', array('%style' => $style->label()))); // Load the style by the new name with the new weights. - $style = entity_load('image_style', $style_name); + $style = ImageStyle::load($style_name); // Confirm the new style order was saved. $effect_edits_order = array_reverse($effect_edits_order); @@ -257,7 +258,7 @@ function testStyle() { $directory = file_default_scheme() . '://styles/' . $style_name; $this->assertFalse(is_dir($directory), format_string('Image style %style directory removed on style deletion.', array('%style' => $style->label()))); - $this->assertFalse(entity_load('image_style', $style_name), format_string('Image style %style successfully deleted.', array('%style' => $style->label()))); + $this->assertFalse(ImageStyle::load($style_name), format_string('Image style %style successfully deleted.', array('%style' => $style->label()))); } @@ -307,7 +308,7 @@ function testStyleReplacement() { $this->drupalGet('node/' . $nid); // Reload the image style using the new name. - $style = entity_load('image_style', $new_style_name); + $style = ImageStyle::load($new_style_name); $this->assertRaw($style->buildUrl($original_uri), 'Image displayed using style replacement style.'); // Delete the style and choose a replacement style. @@ -318,7 +319,7 @@ function testStyleReplacement() { $message = t('Style %name was deleted.', array('%name' => $new_style_label)); $this->assertRaw($message); - $replacement_style = entity_load('image_style', 'thumbnail'); + $replacement_style = ImageStyle::load('thumbnail'); $this->drupalGet('node/' . $nid); $this->assertRaw($replacement_style->buildUrl($original_uri), 'Image displayed using style replacement style.'); } @@ -436,7 +437,7 @@ function testConfigImport() { $staging->delete('image.style.' . $style_name); $this->configImporter()->import(); - $this->assertFalse(entity_load('image_style', $style_name), 'Style deleted after config import.'); + $this->assertFalse(ImageStyle::load($style_name), 'Style deleted after config import.'); $this->assertEqual($this->getImageCount($style), 0, 'Image style was flushed after being deleted by config import.'); } diff --git a/core/modules/image/src/Tests/ImageFieldDisplayTest.php b/core/modules/image/src/Tests/ImageFieldDisplayTest.php index 24330bf..6a60a1a 100644 --- a/core/modules/image/src/Tests/ImageFieldDisplayTest.php +++ b/core/modules/image/src/Tests/ImageFieldDisplayTest.php @@ -9,6 +9,7 @@ use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\image\Entity\ImageStyle; /** * Tests the display of image fields. @@ -139,7 +140,7 @@ function _testImageFieldFormatters($scheme) { // Ensure the derivative image is generated so we do not have to deal with // image style callback paths. - $this->drupalGet(entity_load('image_style', 'thumbnail')->buildUrl($image_uri)); + $this->drupalGet(ImageStyle::load('thumbnail')->buildUrl($image_uri)); $image_style = array( '#theme' => 'image_style', '#uri' => $image_uri, @@ -156,7 +157,7 @@ function _testImageFieldFormatters($scheme) { if ($scheme == 'private') { // Log out and try to access the file. $this->drupalLogout(); - $this->drupalGet(entity_load('image_style', 'thumbnail')->buildUrl($image_uri)); + $this->drupalGet(ImageStyle::load('thumbnail')->buildUrl($image_uri)); $this->assertResponse('403', 'Access denied to image style thumbnail as anonymous user.'); } } diff --git a/core/modules/image/src/Tests/ImageStyleFlushTest.php b/core/modules/image/src/Tests/ImageStyleFlushTest.php index 1ebe27b..965e674 100644 --- a/core/modules/image/src/Tests/ImageStyleFlushTest.php +++ b/core/modules/image/src/Tests/ImageStyleFlushTest.php @@ -6,6 +6,7 @@ */ namespace Drupal\image\Tests; +use Drupal\image\Entity\ImageStyle; /** * Tests flushing of image styles. @@ -79,7 +80,7 @@ function testFlush() { } // Load the saved image style. - $style = entity_load('image_style', $style_name); + $style = ImageStyle::load($style_name); // Create an image for the 'public' wrapper. $image_path = $this->createSampleImage($style, 'public'); diff --git a/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php b/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php index 3715620..d9b9ba3 100644 --- a/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php +++ b/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php @@ -8,6 +8,7 @@ namespace Drupal\rdf\Tests; use Drupal\image\Tests\ImageFieldTestBase; +use Drupal\image\Entity\ImageStyle; /** * Tests the RDFa markup of imagefields. @@ -94,7 +95,7 @@ function testNodeTeaser() { // Construct the node and image URIs for testing. $node_uri = url('node/' . $this->node->id(), array('absolute' => TRUE)); - $image_uri = entity_load('image_style', 'medium')->buildUrl($this->file->getFileUri()); + $image_uri = ImageStyle::load('medium')->buildUrl($this->file->getFileUri()); // Test relations from node to image. $expected_value = array( diff --git a/core/modules/rdf/src/Tests/StandardProfileTest.php b/core/modules/rdf/src/Tests/StandardProfileTest.php index 2b297a4..910e510 100644 --- a/core/modules/rdf/src/Tests/StandardProfileTest.php +++ b/core/modules/rdf/src/Tests/StandardProfileTest.php @@ -9,6 +9,7 @@ use Drupal\node\NodeInterface; use Drupal\simpletest\WebTestBase; +use Drupal\image\Entity\ImageStyle; /** * Tests the RDF mappings and RDFa markup of the standard profile. @@ -163,7 +164,7 @@ protected function setUp() { // Set URIs. // Image. $image_file = $this->article->get('field_image')->entity; - $this->imageUri = entity_load('image_style', 'large')->buildUrl($image_file->getFileUri()); + $this->imageUri = ImageStyle::load('large')->buildUrl($image_file->getFileUri()); // Term. $this->termUri = $this->term->url('canonical', array('absolute' => TRUE)); // Article. @@ -223,7 +224,7 @@ protected function doFrontPageRdfaTests() { // @todo Once the image points to the original instead of the processed // image, move this to testArticleProperties(). $image_file = $this->article->get('field_image')->entity; - $image_uri = entity_load('image_style', 'medium')->buildUrl($image_file->getFileUri()); + $image_uri = ImageStyle::load('medium')->buildUrl($image_file->getFileUri()); $expected_value = array( 'type' => 'uri', 'value' => $image_uri, diff --git a/core/modules/responsive_image/responsive_image.module b/core/modules/responsive_image/responsive_image.module index d8985c9..0e6ac77 100644 --- a/core/modules/responsive_image/responsive_image.module +++ b/core/modules/responsive_image/responsive_image.module @@ -8,6 +8,7 @@ use Drupal\Component\Utility\SafeMarkup; use Drupal\Core\Routing\RouteMatchInterface; use \Drupal\Core\Template\Attribute; +use Drupal\image\Entity\ImageStyle; /** * The machine name for the empty image breakpoint image style option. @@ -323,7 +324,7 @@ function responsive_image_get_image_dimensions($variables) { ); } else { - entity_load('image_style', $variables['style_name'])->transformDimensions($dimensions); + ImageStyle::load($variables['style_name'])->transformDimensions($dimensions); } return $dimensions; @@ -337,6 +338,6 @@ function _responsive_image_image_style_url($style_name, $path) { // The smallest data URI for a 1px square transparent GIF image. return 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7'; } - return entity_load('image_style', $style_name)->buildUrl($path); + return ImageStyle::load($style_name)->buildUrl($path); } diff --git a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php index 68aa58b..983e9a2 100644 --- a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php +++ b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php @@ -8,9 +8,13 @@ namespace Drupal\responsive_image\Plugin\Field\FieldFormatter; use Drupal\Component\Utility\NestedArray; +use Drupal\Core\Entity\EntityStorageInterface; +use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\image\Plugin\Field\FieldFormatter\ImageFormatterBase; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Plugin for responsive image formatter. @@ -23,7 +27,37 @@ * } * ) */ -class ResponsiveImageFormatter extends ImageFormatterBase { +class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFactoryPluginInterface { + + /** + * @var EntityStorageInterface + */ + protected $imageStyleStorage; + + /** + * {@inheritdoc} + */ + public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, EntityStorageInterface $image_style_storage) { + parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings); + + $this->imageStyleStorage = $image_style_storage; + } + + /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) { + return new static( + $plugin_id, + $plugin_definition, + $configuration['field_definition'], + $configuration['settings'], + $configuration['label'], + $configuration['view_mode'], + $configuration['third_party_settings'], + $container->get('entity.manager')->getStorage('image_style') + ); + } /** * {@inheritdoc} @@ -156,7 +190,7 @@ public function viewElements(FieldItemListInterface $items) { $image_styles_to_load[] = $mapping['image_style']; } } - $image_styles = entity_load_multiple('image_style', $image_styles_to_load); + $image_styles = $this->imageStyleStorage->loadMultiple($image_styles_to_load); foreach ($image_styles as $image_style) { $all_cache_tags[] = $image_style->getCacheTag(); } diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php index ffe6af3..337c611 100644 --- a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php +++ b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php @@ -8,6 +8,7 @@ namespace Drupal\responsive_image\Tests; use Drupal\image\Tests\ImageFieldTestBase; +use Drupal\image\Entity\ImageStyle; /** * Tests responsive image display formatter. @@ -161,7 +162,7 @@ public function _testResponsiveImageFieldFormatters($scheme) { $this->assertTrue(in_array('image_style:large', $cache_tags)); // Test the fallback image style. - $large_style = entity_load('image_style', 'large'); + $large_style = ImageStyle::load('large'); $fallback_image = array( '#theme' => 'responsive_image_source', '#src' => $large_style->buildUrl($image_uri), diff --git a/core/modules/system/src/Tests/Entity/ConfigEntityImportTest.php b/core/modules/system/src/Tests/Entity/ConfigEntityImportTest.php index 85cf0d2..5bc4e29 100644 --- a/core/modules/system/src/Tests/Entity/ConfigEntityImportTest.php +++ b/core/modules/system/src/Tests/Entity/ConfigEntityImportTest.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\EntityWithPluginBagsInterface; use Drupal\simpletest\WebTestBase; +use Drupal\image\Entity\ImageStyle; /** * Tests ConfigEntity importing. @@ -123,7 +124,7 @@ protected function doImageStyleUpdate() { $name = 'image.style.thumbnail'; /** @var $entity \Drupal\image\Entity\ImageStyle */ - $entity = entity_load('image_style', 'thumbnail'); + $entity = ImageStyle::load('thumbnail'); $plugin_bag = $entity->getPluginBags()['effects']; $effects = $entity->get('effects');