Issue #3055193 by catch, martin107, jungle, mikelutz, longwave, andypost,... (c8cc155d) · Commits · project / drupal

core/core.services.yml

+0 −2

Original line number	Diff line number	Diff line
		@@ -1656,8 +1656,6 @@ services:
		file.mime_type.guesser:
		class: Drupal\Core\File\MimeType\MimeTypeGuesser
		arguments: ['@stream_wrapper_manager']
		tags:
		- { name: service_collector, tag: mime_type_guesser, call: addGuesser }
		lazy: true
		file.mime_type.guesser.extension:
		class: Drupal\Core\File\MimeType\ExtensionMimeTypeGuesser

core/lib/Drupal/Core/CoreServiceProvider.php

+2 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		use Drupal\Core\DependencyInjection\ServiceProviderInterface;
		use Drupal\Core\DependencyInjection\ContainerBuilder;
		use Drupal\Core\DependencyInjection\Compiler\ModifyServiceDefinitionsPass;
		use Drupal\Core\DependencyInjection\Compiler\MimeTypePass;
		use Drupal\Core\DependencyInjection\Compiler\TaggedHandlersPass;
		use Drupal\Core\DependencyInjection\Compiler\RegisterEventSubscribersPass;
		use Drupal\Core\DependencyInjection\Compiler\RegisterAccessChecksPass;
		@@ -73,6 +74,7 @@ public function register(ContainerBuilder $container) {

		// Collect tagged handler services as method calls on consumer services.
		$container->addCompilerPass(new TaggedHandlersPass());
		$container->addCompilerPass(new MimeTypePass());
		$container->addCompilerPass(new RegisterStreamWrappersPass());
		$container->addCompilerPass(new GuzzleMiddlewarePass());

core/lib/Drupal/Core/DependencyInjection/Compiler/MimeTypePass.php

0 → 100644

+77 −0

Original line number	Diff line number	Diff line
		<?php

		namespace Drupal\Core\DependencyInjection\Compiler;

		use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
		use Symfony\Component\DependencyInjection\ContainerBuilder;
		use Symfony\Component\DependencyInjection\Exception\LogicException;
		use Symfony\Component\DependencyInjection\Reference;
		use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface as LegacyMimeTypeGuesserInterface;
		use Symfony\Component\Mime\MimeTypeGuesserInterface;

		/**
		* Adds @mime_type_guesser tagged services to handle forwards compatibility.
		*
		* @internal
		*
		* @deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. No direct
		* replacement is provided.
		*
		* @see https://www.drupal.org/node/3133341
		*/
		class MimeTypePass implements CompilerPassInterface {

		/**
		* {@inheritdoc}
		*/
		public function process(ContainerBuilder $container) {
		$consumer = $container->getDefinition('file.mime_type.guesser');

		$tag = 'mime_type_guesser';
		$interface = MimeTypeGuesserInterface::class;
		$deprecated_interface = LegacyMimeTypeGuesserInterface::class;

		// Find all tagged handlers.
		$handlers = [];
		foreach ($container->findTaggedServiceIds($tag) as $id => $attributes) {
		// Validate the interface.
		$handler = $container->getDefinition($id);
		if (!is_subclass_of($handler->getClass(), $interface)) {
		// Special handling for $deprecated_interface.
		if (!is_subclass_of($handler->getClass(), $deprecated_interface)) {
		throw new LogicException("Service '$id' does not implement $interface.");
		}
		}
		$handlers[$id] = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;
		$interfaces[$id] = $handler->getClass();
		}
		if (empty($handlers)) {
		throw new LogicException(sprintf("At least one service tagged with '%s' is required.", $tag));
		}

		// Sort all handlers by priority.
		arsort($handlers, SORT_NUMERIC);

		// Add a method call for each handler to the consumer service
		// definition.
		foreach ($handlers as $id => $priority) {
		$arguments = [];
		$arguments[0] = new Reference($id);
		if (isset($priority_pos)) {
		$arguments[$priority_pos] = $priority;
		}
		if (isset($id_pos)) {
		$arguments[$id_pos] = $id;
		}
		// Sort the arguments by position.
		ksort($arguments);
		if (is_subclass_of($interfaces[$id], $interface)) {
		$consumer->addMethodCall('addMimeTypeGuesser', $arguments);
		}
		else {
		$consumer->addMethodCall('addGuesser', $arguments);
		}
		}
		}

		}

core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php

+18 −2

Original line number	Diff line number	Diff line
		@@ -3,12 +3,13 @@
		namespace Drupal\Core\File\MimeType;

		use Drupal\Core\Extension\ModuleHandlerInterface;
		use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface;
		use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface as LegacyMimeTypeGuesserInterface;
		use Symfony\Component\Mime\MimeTypeGuesserInterface;

		/**
		* Makes possible to guess the MIME type of a file using its extension.
		*/
		class ExtensionMimeTypeGuesser implements MimeTypeGuesserInterface {
		class ExtensionMimeTypeGuesser implements MimeTypeGuesserInterface, LegacyMimeTypeGuesserInterface {

		/**
		* Default MIME extension mapping.
		@@ -889,6 +890,14 @@ public function __construct(ModuleHandlerInterface $module_handler) {
		* {@inheritdoc}
		*/
		public function guess($path) {
		@trigger_error(__METHOD__ . '() is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Use ::guessMimeType() instead. See https://www.drupal.org/node/3133341', E_USER_DEPRECATED);
		return $this->guessMimeType($path);
		}

		/**
		* {@inheritdoc}
		*/
		public function guessMimeType($path): ?string {
		if ($this->mapping === NULL) {
		$mapping = $this->defaultMapping;
		// Allow modules to alter the default mapping.
		@@ -927,4 +936,11 @@ public function setMapping(array $mapping = NULL) {
		$this->mapping = $mapping;
		}

		/**
		* {@inheritdoc}
		*/
		public function isGuesserSupported(): bool {
		return TRUE;
		}

		}

core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php

+46 −5

Original line number	Diff line number	Diff line
		@@ -5,12 +5,13 @@
		use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
		use Symfony\Component\DependencyInjection\ContainerInterface;
		use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser as SymfonyMimeTypeGuesser;
		use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface;
		use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface as LegacyMimeTypeGuesserInterface;
		use Symfony\Component\Mime\MimeTypeGuesserInterface as MimeTypeGuesserInterface;

		/**
		* Defines a MIME type guesser that also supports stream wrapper paths.
		*/
		class MimeTypeGuesser implements MimeTypeGuesserInterface {
		class MimeTypeGuesser implements LegacyMimeTypeGuesserInterface, MimeTypeGuesserInterface {

		/**
		* An array of arrays of registered guessers keyed by priority.
		@@ -51,7 +52,7 @@ public function __construct(StreamWrapperManagerInterface $stream_wrapper_manage
		/**
		* {@inheritdoc}
		*/
		public function guess($path) {
		public function guessMimeType(string $path) : ?string {
		if ($wrapper = $this->streamWrapperManager->getViaUri($path)) {
		// Get the real path from the stream wrapper, if available. Files stored
		// in remote file systems will not have one.
		@@ -67,13 +68,40 @@ public function guess($path) {
		}

		foreach ($this->sortedGuessers as $guesser) {
		$mime_type = $guesser->guess($path);
		$mime_type = $guesser->guessMimeType($path);
		if ($mime_type !== NULL) {
		return $mime_type;
		}
		}
		}

		/**
		* {@inheritdoc}
		*/
		public function guess($path) {
		@trigger_error(__METHOD__ . '() is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Use ::guessMimeType() instead. See https://www.drupal.org/node/3133341', E_USER_DEPRECATED);
		return $this->guessMimeType($path);
		}

		/**
		* Appends a MIME type guesser to the guessers chain.
		*
		* @param \Symfony\Component\Mime\MimeTypeGuesserInterface $guesser
		* The guesser to be appended.
		* @param int $priority
		* The priority of the guesser being added.
		*
		* @return $this
		*/
		public function addMimeTypeGuesser(MimeTypeGuesserInterface $guesser, $priority = 0) {
		if ($guesser->isGuesserSupported()) {
		$this->guessers[$priority][] = $guesser;
		// Mark sorted guessers for rebuild.
		$this->sortedGuessers = NULL;
		}
		return $this;
		}

		/**
		* Appends a MIME type guesser to the guessers chain.
		*
		@@ -83,14 +111,27 @@ public function guess($path) {
		* The priority of the guesser being added.
		*
		* @return $this
		*
		* @deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Use
		* ::addMimeTypeGuesser() instead.
		*
		* @see https://www.drupal.org/node/3133341
		*/
		public function addGuesser(MimeTypeGuesserInterface $guesser, $priority = 0) {
		public function addGuesser(LegacyMimeTypeGuesserInterface $guesser, $priority = 0) {
		@trigger_error(__METHOD__ . ' is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Use ::addMimeTypeGuesser() instead. See https://www.drupal.org/node/3133341', E_USER_DEPRECATED);
		$this->guessers[$priority][] = $guesser;
		// Mark sorted guessers for rebuild.
		$this->sortedGuessers = NULL;
		return $this;
		}

		/**
		* {@inheritdoc}
		*/
		public function isGuesserSupported(): bool {
		return TRUE;
		}

		/**
		* Sorts guessers according to priority.
		*