Merge branch '4.2' into 4.3
* 4.2: [Form] fix usage of legacy TranslatorInterface [Serializer] Fix DataUriNormalizer docblock & composer suggest section
This commit is contained in:
commit
770162af05
@ -20,7 +20,8 @@ use Symfony\Component\Form\FormInterface;
|
|||||||
use Symfony\Component\Form\FormView;
|
use Symfony\Component\Form\FormView;
|
||||||
use Symfony\Component\OptionsResolver\Options;
|
use Symfony\Component\OptionsResolver\Options;
|
||||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||||
use Symfony\Component\Translation\TranslatorInterface;
|
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
|
||||||
|
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||||
|
|
||||||
class FileType extends AbstractType
|
class FileType extends AbstractType
|
||||||
{
|
{
|
||||||
@ -35,8 +36,14 @@ class FileType extends AbstractType
|
|||||||
|
|
||||||
private $translator;
|
private $translator;
|
||||||
|
|
||||||
public function __construct(TranslatorInterface $translator = null)
|
/**
|
||||||
|
* @param TranslatorInterface|null $translator
|
||||||
|
*/
|
||||||
|
public function __construct($translator = null)
|
||||||
{
|
{
|
||||||
|
if (null !== $translator && !$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) {
|
||||||
|
throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator)));
|
||||||
|
}
|
||||||
$this->translator = $translator;
|
$this->translator = $translator;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ use Symfony\Component\Form\NativeRequestHandler;
|
|||||||
use Symfony\Component\Form\RequestHandlerInterface;
|
use Symfony\Component\Form\RequestHandlerInterface;
|
||||||
use Symfony\Component\HttpFoundation\File\File;
|
use Symfony\Component\HttpFoundation\File\File;
|
||||||
use Symfony\Component\HttpFoundation\File\UploadedFile;
|
use Symfony\Component\HttpFoundation\File\UploadedFile;
|
||||||
use Symfony\Component\Translation\TranslatorInterface;
|
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||||
|
|
||||||
class FileTypeTest extends BaseTypeTest
|
class FileTypeTest extends BaseTypeTest
|
||||||
{
|
{
|
||||||
|
@ -34,7 +34,7 @@ class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface, C
|
|||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var MimeTypeGuesserInterface
|
* @var MimeTypeGuesserInterface|null
|
||||||
*/
|
*/
|
||||||
private $mimeTypeGuesser;
|
private $mimeTypeGuesser;
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
"symfony/yaml": "For using the default YAML mapping loader.",
|
"symfony/yaml": "For using the default YAML mapping loader.",
|
||||||
"symfony/config": "For using the XML mapping loader.",
|
"symfony/config": "For using the XML mapping loader.",
|
||||||
"symfony/property-access": "For using the ObjectNormalizer.",
|
"symfony/property-access": "For using the ObjectNormalizer.",
|
||||||
"symfony/http-foundation": "To use the DataUriNormalizer.",
|
"symfony/http-foundation": "For using a MIME type guesser within the DataUriNormalizer.",
|
||||||
"doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
|
"doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
|
||||||
"doctrine/cache": "For using the default cached annotation reader and metadata cache."
|
"doctrine/cache": "For using the default cached annotation reader and metadata cache."
|
||||||
},
|
},
|
||||||
|
Reference in New Issue
Block a user