X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fimage%2Ftests%2Fsrc%2FKernel%2FImageFormatterTest.php;fp=web%2Fcore%2Fmodules%2Fimage%2Ftests%2Fsrc%2FKernel%2FImageFormatterTest.php;h=e994f12e279ef99bb266ec07dba7be2384f2af3e;hp=f001743509a567f60cff26a0d102041f948c9588;hb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;hpb=aea91e65e895364e460983b890e295aa5d5540a5 diff --git a/web/core/modules/image/tests/src/Kernel/ImageFormatterTest.php b/web/core/modules/image/tests/src/Kernel/ImageFormatterTest.php index f00174350..e994f12e2 100644 --- a/web/core/modules/image/tests/src/Kernel/ImageFormatterTest.php +++ b/web/core/modules/image/tests/src/Kernel/ImageFormatterTest.php @@ -7,6 +7,8 @@ use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\file\Entity\File; +use Drupal\image\Entity\ImageStyle; use Drupal\Tests\field\Kernel\FieldKernelTestBase; /** @@ -99,4 +101,89 @@ class ImageFormatterTest extends FieldKernelTestBase { $this->assertEquals($entity->{$this->fieldName}[1]->entity->getCacheTags(), $build[$this->fieldName][1]['#cache']['tags'], 'Second image cache tags is as expected'); } + /** + * Tests ImageFormatter's handling of SVG images. + * + * @requires extension gd + */ + public function testImageFormatterSvg() { + // Install the default image styles. + $this->installConfig(['image']); + + /** @var \Drupal\Core\Render\RendererInterface $renderer */ + $renderer = $this->container->get('renderer'); + + $png = File::create([ + 'uri' => 'public://test-image.png', + ]); + $png->save(); + + // We need to create an actual empty PNG, or the GD toolkit will not + // consider the image valid. + $png_resource = imagecreate(300, 300); + imagefill($png_resource, 0, 0, imagecolorallocate($png_resource, 0, 0, 0)); + imagepng($png_resource, $png->getFileUri()); + + $svg = File::create([ + 'uri' => 'public://test-image.svg', + ]); + $svg->save(); + // We don't have to put any real SVG data in here, because the GD toolkit + // won't be able to load it anyway. + touch($svg->getFileUri()); + + $entity = EntityTest::create([ + 'name' => $this->randomMachineName(), + $this->fieldName => [$png, $svg], + ]); + $entity->save(); + + // Ensure that the display is using the medium image style. + $component = $this->display->getComponent($this->fieldName); + $component['settings']['image_style'] = 'medium'; + $this->display->setComponent($this->fieldName, $component)->save(); + + $build = $this->display->build($entity); + + // The first image is a PNG, so it is supported by the GD image toolkit. + // The image style should be applied with its cache tags, image derivative + // computed with its URI and dimensions. + $this->assertCacheTags($build[$this->fieldName][0], ImageStyle::load('medium')->getCacheTags()); + $renderer->renderRoot($build[$this->fieldName][0]); + $this->assertEquals('medium', $build[$this->fieldName][0]['#image_style']); + // We check that the image URL contains the expected style directory + // structure. + $this->assertTrue(strpos($build[$this->fieldName][0]['#markup'], 'styles/medium/public/test-image.png') !== FALSE); + $this->assertTrue(strpos($build[$this->fieldName][0]['#markup'], 'width="220"') !== FALSE); + $this->assertTrue(strpos($build[$this->fieldName][0]['#markup'], 'height="220"') !== FALSE); + + // The second image is an SVG, which is not supported by the GD toolkit. + // The image style should still be applied with its cache tags, but image + // derivative will not be available so tag will point to the original + // image. + $this->assertCacheTags($build[$this->fieldName][1], ImageStyle::load('medium')->getCacheTags()); + $renderer->renderRoot($build[$this->fieldName][1]); + $this->assertEquals('medium', $build[$this->fieldName][1]['#image_style']); + // We check that the image URL does not contain the style directory + // structure. + $this->assertFalse(strpos($build[$this->fieldName][1]['#markup'], 'styles/medium/public/test-image.svg')); + // Since we did not store original image dimensions, width and height + // HTML attributes will not be present. + $this->assertFalse(strpos($build[$this->fieldName][1]['#markup'], 'width')); + $this->assertFalse(strpos($build[$this->fieldName][1]['#markup'], 'height')); + } + + /** + * Asserts that a renderable array has a set of cache tags. + * + * @param array $renderable + * The renderable array. Must have a #cache[tags] element. + * @param array $cache_tags + * The expected cache tags. + */ + protected function assertCacheTags(array $renderable, array $cache_tags) { + $diff = array_diff($cache_tags, $renderable['#cache']['tags']); + $this->assertEmpty($diff); + } + }