10000 Merge branch '4.3' into 4.4 · symfony/symfony@3d9e884 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3d9e884

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.3' into 4.4
* 4.3: [Serializer] Fix DataUriNormalizer deprecation (MIME type guesser is optional) [DependencyInjection] fix the ValidateEnvPlaceHolderPassTest that was using a deprecated path for TreeBuilder avoid service id conflicts with Swiftmailer [Form] fix usage of legacy TranslatorInterface [Serializer] Fix DataUriNormalizer docblock & composer suggest section
2 parents 482c357 + 4f714a6 commit 3d9e884

File tree

8 files changed

+27
-18
lines changed

8 files changed

+27
-18
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1916,7 +1916,7 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
19161916
}
19171917

19181918
$loader->load('mailer.xml');
1919-
$container->getDefinition('mailer.transport')->setArgument(0, $config['dsn']);
1919+
$container->getDefinition('mailer.default_transport')->setArgument(0, $config['dsn']);
19201920
}
19211921

19221922
/**

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66

77
<services>
88
<service id="mailer.mailer" class="Symfony\Component\Mailer\Mailer">
9-
<argument type="service" id="mailer.transport" />
9+
<argument type="service" id="mailer.default_transport" />
1010
<argument type="service" id="messenger.default_bus" on-invalid="ignore" />
1111
</service>
1212
<service id="mailer" alias="mailer.mailer" />
1313
<service id="Symfony\Component\Mailer\MailerInterface" alias="mailer.mailer" />
1414

15-
<service id="mailer.transport" class="Symfony\Component\Mailer\Transport\TransportInterface">
15+
<service id="mailer.default_transport" class="Symfony\Component\Mailer\Transport\TransportInterface">
1616
<factory class="Symfony\Component\Mailer\Transport" method="fromDsn" />
1717
<argument /> <!-- env(MAILER_DSN) -->
1818
<argument type="service" id="event_dispatcher" />
1919
<argument type="service" id="http_client" on-invalid="ignore" />
2020
<argument type="service" id="logger" on-invalid="ignore" />
2121
</service>
22-
<service id="Symfony\Component\Mailer\Transport\TransportInterface" alias="mailer.transport" />
22+
<service id="Symfony\Component\Mailer\Transport\TransportInterface" alias="mailer.default_transport" />
2323

2424
<service id="mailer.messenger.message_handler" class="Symfony\Component\Mailer\Messenger\MessageHandler">
25-
<argument type="service" id="mailer.transport" />
25+
<argument type="service" id="mailer.default_transport" />
2626
<tag name="messenger.message_handler" />
2727
</service>
2828
</services>

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,16 +392,16 @@ class EnvConfigurationWithoutRootNode implements ConfigurationInterface
392392
{
393393
public function getConfigTreeBuilder()
394394
{
395-
return new TreeBuilder();
395+
return new TreeBuilder('env_extension');
396396
}
397397
}
398398

399399
class ConfigurationWithArrayNodeRequiringOneElement implements ConfigurationInterface
400400
{
401401
public function getConfigTreeBuilder()
402402
{
403-
$treeBuilder = new TreeBuilder();
404-
$treeBuilder->root('env_extension')
403+
$treeBuilder = new TreeBuilder('env_extension');
404+
$treeBuilder->getRootNode()
405405
->children()
406406
->arrayNode('nodes')
407407
->isRequired()

‎src/Symfony/Component/Form/Extension/Core/Type/FileType.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
use Symfony\Component\Form\FormView;
2121
use Symfony\Component\OptionsResolver\Options;
2222
use Symfony\Component\OptionsResolver\OptionsResolver;
23-
use Symfony\Component\Translation\TranslatorInterface;
23+
use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
24+
use Symfony\Contracts\Translation\TranslatorInterface;
2425

2526
class FileType extends AbstractType
2627
{
@@ -35,8 +36,14 @@ class FileType extends AbstractType
3536

3637
private $translator;
3738

38-
public function __construct(TranslatorInterface $translator = null)
39+
/**
40+
* @param TranslatorInterface|null $translator
41+
*/
42+
public function __construct($translator = null)
3943
{
44+
if (null !== $translator && !$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) {
45+
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)));
46+
}
4047
$this->translator = $translator;
4148
}
4249

‎src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
use Symfony\Component\Form\RequestHandlerInterface;
1818
use Symfony\Component\HttpFoundation\File\File;
1919
use Symfony\Component\HttpFoundation\File\UploadedFile;
20-
use Symfony\Component\Translation\TranslatorInterface;
20+
use Symfony\Contracts\Translation\TranslatorInterface;
2121

2222
class FileTypeTest extends BaseTypeTest
2323
{

‎src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface, C
3434
];
3535

3636
/**
37-
* @var MimeTypeGuesserInterface
37+
* @var MimeTypeGuesserInterface|null
3838
*/
3939
private $mimeTypeGuesser;
4040

4141
/**
42-
* @param MimeTypeGuesserInterface
42+
* @param MimeTypeGuesserInterface|null $mimeTypeGuesser
4343
*/
4444
public function __construct($mimeTypeGuesser = null)
4545
{
@@ -48,8 +48,8 @@ public function __construct($mimeTypeGuesser = null)
4848
} elseif (null === $mimeTypeGuesser) {
4949
if (class_exists(MimeTypes::class)) {
5050
$mimeTypeGuesser = MimeTypes::getDefault();
51-
} else {
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);
51+
} elseif (class_exists(MimeTypeGuesser::class)) {
52+
@trigger_error(sprintf('Passing null to "%s()" to use a default MIME type guesser without Symfony Mime installed is deprecated since Symfony 4.3. Try running "composer require symfony/mime".', __METHOD__), E_USER_DEPRECATED);
5353
$mimeTypeGuesser = MimeTypeGuesser::getInstance();
5454
}
5555
} elseif (!$mimeTypeGuesser instanceof MimeTypes) {
@@ -156,7 +156,9 @@ private function getMimeType(\SplFileInfo $object)
156156

157157
if ($this->mimeTypeGuesser instanceof DeprecatedMimeTypeGuesserInterface && $mimeType = $this->mimeTypeGuesser->guess($object->getPathname())) {
158158
return $mimeType;
159-
} elseif ($this->mimeTypeGuesser && $mimeType = $this->mimeTypeGuesser->guessMimeType($object->getPathname())) {
159+
}
160+
161+
if ($this->mimeTypeGuesser && $mimeType = $this->mimeTypeGuesser->guessMimeType($object->getPathname())) {
160162
return $mimeType;
161163
}
162164

‎src/Symfony/Component/Serializer/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"symfony/yaml": "For using the default YAML mapping loader.",
4646
"symfony/config": "For using the XML mapping loader.",
4747
"symfony/property-access": "For using the ObjectNormalizer.",
48-
"symfony/http-foundation": "To use the DataUriNormalizer.",
48+
"symfony/http-foundation": "For using a MIME type guesser within the DataUriNormalizer.",
4949
"doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
5050
"doctrine/cache": "For using the default cached annotation reader and metadata cache."
5151
},

‎src/Symfony/Component/Validator/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"symfony/cache": "^3.4|^4.0|^5.0",
3535
"symfony/property-access": "^3.4|^4.0|^5.0",
3636
"symfony/property-info": "^3.4|^4.0|^5.0",
37-
"symfony/translation": "^5.0",
37+
"symfony/translation": "^4.4",
3838
"doctrine/annotations": "~1.0",
3939
"doctrine/cache": "~1.0",
4040
"egulias/email-validator": "^1.2.8|~2.0"

0 commit comments

Comments
 (0)
0