tweaked code

fabpot · fabpot · commit bdca5d999b36 · 2019-01-17T00:00:01.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddMimeTypeGuesserPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddMimeTypeGuesserPass.php
@@ -30,7 +30,7 @@ public function process(ContainerBuilder $container)
         if ($container->has('mime_types')) {
             $definition = $container->findDefinition('mime_types');
             foreach ($container->findTaggedServiceIds('mime.mime_type_guesser', true) as $id => $attributes) {
-                $definition->addMethodCall('registerGuesser', array(new Reference($id)));
+                $definition->addMethodCall('registerGuesser', [new Reference($id)]);
             }
         }
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -42,6 +42,7 @@ class UnusedTagsPass implements CompilerPassInterface
         'messenger.bus',
         'messenger.receiver',
         'messenger.message_handler',
+        'mime.mime_type_guesser',
         'monolog.logger',
         'proxy',
         'routing.expression_language_provider',
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -73,8 +73,8 @@
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Symfony\Component\Messenger\Transport\TransportFactoryInterface;
 use Symfony\Component\Messenger\Transport\TransportInterface;
-use Symfony\Component\Mime\MimeTypes;
 use Symfony\Component\Mime\MimeTypeGuesserInterface;
+use Symfony\Component\Mime\MimeTypes;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 use Symfony\Component\PropertyInfo\PropertyAccessExtractorInterface;
 use Symfony\Component\PropertyInfo\PropertyDescriptionExtractorInterface;
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -13,8 +13,8 @@
 
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddAnnotationsCachedReaderPass;
 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\AddMimeTypeGuesserPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ContainerBuilderDebugDumpPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\DataCollectorTranslatorPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\LoggingTranslatorPass;
diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php
@@ -21,6 +21,8 @@
  * Guesses the mime type with the binary "file" (only available on *nix).
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
+ *
+ * @deprecated since Symfony 4.3, use {@link NewFileBinaryMimeTypeGuesser} instead
  */
 class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface
 {
diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php
@@ -21,6 +21,8 @@
  * Guesses the mime type using the PECL extension FileInfo.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
+ *
+ * @deprecated since Symfony 4.3, use {@link NewFileinfoMimeTypeGuesser} instead
  */
 class FileinfoMimeTypeGuesser implements MimeTypeGuesserInterface
 {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php b/src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php
@@ -13,7 +13,6 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\File\File;
-use Symfony\Component\Mime\MimeTypes;
 
 /**
  * @requires extension fileinfo
diff --git a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
@@ -44,16 +44,16 @@ class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface, C
     public function __construct($mimeTypeGuesser = null)
     {
         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) {
             if (class_exists(MimeTypes::class)) {
                 $mimeTypeGuesser = MimeTypes::getDefault();
             } 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();
             }
         } 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;

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function process(ContainerBuilder $container)`
`30`	`30`	`if ($container->has('mime_types')) {`
`31`	`31`	`$definition = $container->findDefinition('mime_types');`
`32`	`32`	`foreach ($container->findTaggedServiceIds('mime.mime_type_guesser', true) as $id => $attributes) {`
`33`		`- $definition->addMethodCall('registerGuesser', array(new Reference($id)));`
	`33`	`+ $definition->addMethodCall('registerGuesser', [new Reference($id)]);`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@`
`21`	`21`	`* Guesses the mime type with the binary "file" (only available on *nix).`
`22`	`22`	`*`
`23`	`23`	`* @author Bernhard Schussek <[email protected]>`
	`24`	`+ *`
	`25`	`+ * @deprecated since Symfony 4.3, use {@link NewFileBinaryMimeTypeGuesser} instead`
`24`	`26`	`*/`
`25`	`27`	`class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface`
`26`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,16 +44,16 @@ class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface, C`
`44`	`44`	`public function __construct($mimeTypeGuesser = null)`
`45`	`45`	`{`
`46`	`46`	`if ($mimeTypeGuesser instanceof DeprecatedMimeTypeGuesserInterface) {`
`47`		`- @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);`
	`47`	`+ @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);`
`48`	`48`	`} elseif (null === $mimeTypeGuesser) {`
`49`	`49`	`if (class_exists(MimeTypes::class)) {`
`50`	`50`	`$mimeTypeGuesser = MimeTypes::getDefault();`
`51`	`51`	`} else {`
`52`		`- @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);`
	`52`	`+ @trigger_error(sprintf('Passing null to "%s()" without symfony/mime installed is deprecated since Symfony 4.3, install symfony/mime.', __METHOD__), E_USER_DEPRECATED);`
`53`	`53`	`$mimeTypeGuesser = MimeTypeGuesser::getInstance();`
`54`	`54`	`}`
`55`	`55`	`} elseif (!$mimeTypeGuesser instanceof MimeTypes) {`
`56`		`- 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)));`
	`56`	`+ 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)));`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`$this->mimeTypeGuesser = $mimeTypeGuesser;`