Skip to content

Commit 287dba9

Browse files
Merge branch '3.3' into 3.4
* 3.3: Removed useless argument $definition Fix comment [Config] Fix checking class existence freshness bumped Symfony version to 3.3.7 updated VERSION for 3.3.6 updated CHANGELOG for 3.3.6 Bump minimal PHP version to ^5.5.9|>=7.0.8
2 parents 0732d86 + 2b785bd commit 287dba9

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1339,7 +1339,7 @@ private function registerSecurityCsrfConfiguration(array $config, ContainerBuild
13391339
private function registerSerializerConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
13401340
{
13411341
if (class_exists('Symfony\Component\Serializer\Normalizer\DataUriNormalizer')) {
1342-
// Run after serializer.normalizer.object
1342+
// Run before serializer.normalizer.object
13431343
$definition = $container->register('serializer.normalizer.data_uri', DataUriNormalizer::class);
13441344
$definition->setPublic(false);
13451345
$definition->addTag('serializer.normalizer', array('priority' => -920));

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=5.5.9",
19+
"php": "^5.5.9|>=7.0.8",
2020
"ext-xml": "*",
2121
"symfony/cache": "~3.4|~4.0",
2222
"symfony/class-loader": "~3.2",

0 commit comments

Comments
 (0)