diff --git a/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php b/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php index 94a51c5..e003b8c 100644 --- a/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php +++ b/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php @@ -100,8 +100,21 @@ protected function sortGuessers() { * @see \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser */ public static function registerWithSymfonyGuesser(ContainerInterface $container) { - SymfonyMimeTypeGuesser::reset(); $singleton = SymfonyMimeTypeGuesser::getInstance(); + + // @todo Remove once Symfony adds a reset() method. + $property = new \ReflectionProperty(get_class($singleton), 'guessers'); + $property->setAccessible(TRUE); + + if (isset($singleton->_beforeDrupalRegistration)) { + // Reset state, else we store more and more services during test runs. + $property->setValue($singleton, $singleton->_beforeDrupalRegistration); + } else { + // Store original state before we register our services. + $singleton->_beforeDrupalRegistration = $property->getValue($singleton); + } + + //$singleton->reset(); $singleton->register($container->get('file.mime_type.guesser')); } diff --git a/core/tests/Drupal/Tests/Core/File/MimeTypeGuesserTest.php b/core/tests/Drupal/Tests/Core/File/MimeTypeGuesserTest.php index a1bf9c2..154c3ec 100644 --- a/core/tests/Drupal/Tests/Core/File/MimeTypeGuesserTest.php +++ b/core/tests/Drupal/Tests/Core/File/MimeTypeGuesserTest.php @@ -38,6 +38,15 @@ public function testSymfonyGuesserRegistration() { MimeTypeGuesser::registerWithSymfonyGuesser($container); $guessers = $this->readAttribute($symfony_guesser, 'guessers'); $this->assertInstanceOf('Drupal\Core\File\MimeType\MimeTypeGuesser', $guessers[0]); + $count = count($guessers); + + $container = new ContainerBuilder(); + $container->set('file.mime_type.guesser', new MimeTypeGuesser()); + MimeTypeGuesser::registerWithSymfonyGuesser($container); + $guessers = $this->readAttribute($symfony_guesser, 'guessers'); + $this->assertInstanceOf('Drupal\Core\File\MimeType\MimeTypeGuesser', $guessers[0]); + $new_count = count($guessers); + $this->assertEquals($count, $new_count, 'The count of mime type guessers remains the same after container re-init.'); } } diff --git a/core/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php b/core/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php index 4e0ba4d..81b2b02 100644 --- a/core/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php +++ b/core/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php @@ -67,10 +67,6 @@ public static function getInstance() return self::$instance; } - public static function reset() { - self::$instance = NULL; - } - /** * Registers all natively provided mime type guessers. */