Upgraded imagemagick and manually altered pdf to image module to handle changes....

[yaffs-website] / web / modules / contrib / imagemagick / src / ImagemagickFormatMapper.php

diff --git a/web/modules/contrib/imagemagick/src/ImagemagickFormatMapper.php b/web/modules/contrib/imagemagick/src/ImagemagickFormatMapper.php
index e21a854848d9d766b0b5ee17f5b96cb221969448..92888a2e16c58bb71a0bb03857adab49748fdd29 100644 (file)
--- a/web/modules/contrib/imagemagick/src/ImagemagickFormatMapper.php
+++ b/web/modules/contrib/imagemagick/src/ImagemagickFormatMapper.php
@@ -9,8 +9,6 @@ use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Config\Schema\SchemaCheckTrait;
 use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
-// @todo change if extension mapping service gets in, see #2311679
-use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface;
 
 /**
  * Provides the ImageMagick format mapper.
@@ -29,9 +27,8 @@ class ImagemagickFormatMapper implements ImagemagickFormatMapperInterface {
 
   /**
    * The MIME type guessing service.
-   * @todo change if extension mapping service gets in, see #2311679
    *
-   * @var \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface
+   * @var \Drupal\imagemagick\MimeTypeMapper
    */
   protected $mimeTypeMapper;
 
@@ -50,21 +47,19 @@ class ImagemagickFormatMapper implements ImagemagickFormatMapperInterface {
   protected $typedConfig;
 
   /**
-   * Constructs an ImagemagickFormatmapper object.
+   * Constructs an ImagemagickFormatMapper object.
    *
    * @param \Drupal\Core\Cache\CacheBackendInterface $cache_service
    *   The cache service.
-   * @param \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface $mime_type_mapper
+   * @param \Drupal\imagemagick\ImagemagickMimeTypeMapper $mime_type_mapper
    *   The MIME type mapping service.
-   *   @todo change if extension mapping service gets in, see #2311679
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The config factory.
    * @param \Drupal\Core\Config\TypedConfigManagerInterface $typed_config
    *   The typed config service.
    */
-  public function __construct(CacheBackendInterface $cache_service, MimeTypeGuesserInterface $mime_type_mapper, ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typed_config) {
+  public function __construct(CacheBackendInterface $cache_service, ImagemagickMimeTypeMapper $mime_type_mapper, ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typed_config) {
     $this->cache = $cache_service;
-    // @todo change if extension mapping service gets in, see #2311679
     $this->mimeTypeMapper = $mime_type_mapper;
     $this->configFactory = $config_factory;
     $this->typedConfig = $typed_config;
@@ -84,7 +79,7 @@ class ImagemagickFormatMapper implements ImagemagickFormatMapperInterface {
     $schema_errors = $this->checkConfigSchema($this->typedConfig, 'imagemagick.settings', $data);
     if ($schema_errors !== TRUE) {
       foreach ($schema_errors as $key => $value) {
-        list($object, $path) = explode(':', $key);
+        list(, $path) = explode(':', $key);
         $components = explode('.', $path);
         if ($components[0] === 'image_formats') {
           if (isset($components[2])) {
@@ -189,7 +184,6 @@ class ImagemagickFormatMapper implements ImagemagickFormatMapperInterface {
     return $enabled_image_formats;
   }
 
-
   /**
    * Returns the enabled image file extensions, processing the config map.
    *