tweaked code
This commit is contained in:
parent
5268389191
commit
bdca5d999b
@ -30,7 +30,7 @@ class AddMimeTypeGuesserPass implements CompilerPassInterface
|
|||||||
if ($container->has('mime_types')) {
|
if ($container->has('mime_types')) {
|
||||||
$definition = $container->findDefinition('mime_types');
|
$definition = $container->findDefinition('mime_types');
|
||||||
foreach ($container->findTaggedServiceIds('mime.mime_type_guesser', true) as $id => $attributes) {
|
foreach ($container->findTaggedServiceIds('mime.mime_type_guesser', true) as $id => $attributes) {
|
||||||
$definition->addMethodCall('registerGuesser', array(new Reference($id)));
|
$definition->addMethodCall('registerGuesser', [new Reference($id)]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -42,6 +42,7 @@ class UnusedTagsPass implements CompilerPassInterface
|
|||||||
'messenger.bus',
|
'messenger.bus',
|
||||||
'messenger.receiver',
|
'messenger.receiver',
|
||||||
'messenger.message_handler',
|
'messenger.message_handler',
|
||||||
|
'mime.mime_type_guesser',
|
||||||
'monolog.logger',
|
'monolog.logger',
|
||||||
'proxy',
|
'proxy',
|
||||||
'routing.expression_language_provider',
|
'routing.expression_language_provider',
|
||||||
|
@ -73,8 +73,8 @@ use Symfony\Component\Messenger\MessageBusInterface;
|
|||||||
use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
|
use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
|
||||||
use Symfony\Component\Messenger\Transport\TransportFactoryInterface;
|
use Symfony\Component\Messenger\Transport\TransportFactoryInterface;
|
||||||
use Symfony\Component\Messenger\Transport\TransportInterface;
|
use Symfony\Component\Messenger\Transport\TransportInterface;
|
||||||
use Symfony\Component\Mime\MimeTypes;
|
|
||||||
use Symfony\Component\Mime\MimeTypeGuesserInterface;
|
use Symfony\Component\Mime\MimeTypeGuesserInterface;
|
||||||
|
use Symfony\Component\Mime\MimeTypes;
|
||||||
use Symfony\Component\PropertyAccess\PropertyAccessor;
|
use Symfony\Component\PropertyAccess\PropertyAccessor;
|
||||||
use Symfony\Component\PropertyInfo\PropertyAccessExtractorInterface;
|
use Symfony\Component\PropertyInfo\PropertyAccessExtractorInterface;
|
||||||
use Symfony\Component\PropertyInfo\PropertyDescriptionExtractorInterface;
|
use Symfony\Component\PropertyInfo\PropertyDescriptionExtractorInterface;
|
||||||
|
@ -13,8 +13,8 @@ namespace Symfony\Bundle\FrameworkBundle;
|
|||||||
|
|
||||||
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddAnnotationsCachedReaderPass;
|
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddAnnotationsCachedReaderPass;
|
||||||
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddDebugLogProcessorPass;
|
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddDebugLogProcessorPass;
|
||||||
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddMimeTypeGuesserPass;
|
|
||||||
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddExpressionLanguageProvidersPass;
|
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddExpressionLanguageProvidersPass;
|
||||||
|
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddMimeTypeGuesserPass;
|
||||||
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ContainerBuilderDebugDumpPass;
|
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ContainerBuilderDebugDumpPass;
|
||||||
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\DataCollectorTranslatorPass;
|
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\DataCollectorTranslatorPass;
|
||||||
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\LoggingTranslatorPass;
|
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\LoggingTranslatorPass;
|
||||||
|
@ -21,6 +21,8 @@ use Symfony\Component\Mime\FileBinaryMimeTypeGuesser as NewFileBinaryMimeTypeGue
|
|||||||
* Guesses the mime type with the binary "file" (only available on *nix).
|
* Guesses the mime type with the binary "file" (only available on *nix).
|
||||||
*
|
*
|
||||||
* @author Bernhard Schussek <bschussek@gmail.com>
|
* @author Bernhard Schussek <bschussek@gmail.com>
|
||||||
|
*
|
||||||
|
* @deprecated since Symfony 4.3, use {@link NewFileBinaryMimeTypeGuesser} instead
|
||||||
*/
|
*/
|
||||||
class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface
|
class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface
|
||||||
{
|
{
|
||||||
|
@ -21,6 +21,8 @@ use Symfony\Component\Mime\FileinfoMimeTypeGuesser as NewFileinfoMimeTypeGuesser
|
|||||||
* Guesses the mime type using the PECL extension FileInfo.
|
* Guesses the mime type using the PECL extension FileInfo.
|
||||||
*
|
*
|
||||||
* @author Bernhard Schussek <bschussek@gmail.com>
|
* @author Bernhard Schussek <bschussek@gmail.com>
|
||||||
|
*
|
||||||
|
* @deprecated since Symfony 4.3, use {@link NewFileinfoMimeTypeGuesser} instead
|
||||||
*/
|
*/
|
||||||
class FileinfoMimeTypeGuesser implements MimeTypeGuesserInterface
|
class FileinfoMimeTypeGuesser implements MimeTypeGuesserInterface
|
||||||
{
|
{
|
||||||
|
@ -13,7 +13,6 @@ namespace Symfony\Component\HttpFoundation\Tests\File;
|
|||||||
|
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Symfony\Component\HttpFoundation\File\File;
|
use Symfony\Component\HttpFoundation\File\File;
|
||||||
use Symfony\Component\Mime\MimeTypes;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @requires extension fileinfo
|
* @requires extension fileinfo
|
||||||
|
@ -44,16 +44,16 @@ class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface, C
|
|||||||
public function __construct($mimeTypeGuesser = null)
|
public function __construct($mimeTypeGuesser = null)
|
||||||
{
|
{
|
||||||
if ($mimeTypeGuesser instanceof DeprecatedMimeTypeGuesserInterface) {
|
if ($mimeTypeGuesser instanceof DeprecatedMimeTypeGuesserInterface) {
|
||||||
@trigger_error(sprintf('Passing a %s to "%s()" is deprecated since Symfony 4.3, pass a %s instead.', DeprecatedMimeTypeGuesserInterface::class, __METHOD__, MimeTypeGuesserInterface::class), E_USER_DEPRECATED);
|
@trigger_error(sprintf('Passing a %s to "%s()" is deprecated since Symfony 4.3, pass a "%s" instead.', DeprecatedMimeTypeGuesserInterface::class, __METHOD__, MimeTypeGuesserInterface::class), E_USER_DEPRECATED);
|
||||||
} elseif (null === $mimeTypeGuesser) {
|
} elseif (null === $mimeTypeGuesser) {
|
||||||
if (class_exists(MimeTypes::class)) {
|
if (class_exists(MimeTypes::class)) {
|
||||||
$mimeTypeGuesser = MimeTypes::getDefault();
|
$mimeTypeGuesser = MimeTypes::getDefault();
|
||||||
} else {
|
} else {
|
||||||
@trigger_error(sprintf('Passing null to "%s()" without symfony/mime installed is deprecated since Symfony 4.3, install symfony/mime.', DeprecatedMimeTypeGuesserInterface::class, __METHOD__), E_USER_DEPRECATED);
|
@trigger_error(sprintf('Passing null to "%s()" without symfony/mime installed is deprecated since Symfony 4.3, install symfony/mime.', __METHOD__), E_USER_DEPRECATED);
|
||||||
$mimeTypeGuesser = MimeTypeGuesser::getInstance();
|
$mimeTypeGuesser = MimeTypeGuesser::getInstance();
|
||||||
}
|
}
|
||||||
} elseif (!$mimeTypeGuesser instanceof MimeTypes) {
|
} elseif (!$mimeTypeGuesser instanceof MimeTypes) {
|
||||||
throw new \InvalidArgumentException(sprintf('Argument 1 passed to %s() must be an instance of %s or null, %s given.', __METHOD__, MimeTypes::class, \is_object($mimeTypeGuesser) ? \get_class($mimeTypeGuesser) : \gettype($mimeTypeGuesser)));
|
throw new \InvalidArgumentException(sprintf('Argument 1 passed to "%s()" must be an instance of "%s" or null, %s given.', __METHOD__, MimeTypes::class, \is_object($mimeTypeGuesser) ? \get_class($mimeTypeGuesser) : \gettype($mimeTypeGuesser)));
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->mimeTypeGuesser = $mimeTypeGuesser;
|
$this->mimeTypeGuesser = $mimeTypeGuesser;
|
||||||
|
Reference in New Issue
Block a user