diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php index 142c47f..849b1c5 100644 --- a/core/lib/Drupal/Core/DrupalKernel.php +++ b/core/lib/Drupal/Core/DrupalKernel.php @@ -1303,7 +1303,7 @@ protected function classLoaderAddMultiplePsr4(array $namespaces = array()) { elseif (is_string($paths)) { $paths = $this->root . '/' . $paths; } - $this->classLoader->addPsr4($prefix . '\\', $paths); + $this->classLoader->setPsr4($prefix . '\\', $paths); } } diff --git a/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php b/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php index 2054463..94a51c5 100644 --- a/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php +++ b/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php @@ -100,6 +100,7 @@ protected function sortGuessers() { * @see \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser */ public static function registerWithSymfonyGuesser(ContainerInterface $container) { + SymfonyMimeTypeGuesser::reset(); $singleton = SymfonyMimeTypeGuesser::getInstance(); $singleton->register($container->get('file.mime_type.guesser')); } diff --git a/core/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php b/core/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php index 81b2b02..4e0ba4d 100644 --- a/core/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php +++ b/core/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php @@ -67,6 +67,10 @@ public static function getInstance() return self::$instance; } + public static function reset() { + self::$instance = NULL; + } + /** * Registers all natively provided mime type guessers. */