diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 77f9fb0ef1..a07d67e511 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -60,9 +60,6 @@ class FrameworkExtension extends Extension
// will be used and everything will still work as expected.
$loader->load('translation.xml');
- // Property access is used by both the Form and the Validator component
- $loader->load('property_access.xml');
-
$configuration = $this->getConfiguration($configs, $container);
$config = $this->processConfiguration($configuration, $configs);
@@ -126,7 +123,7 @@ class FrameworkExtension extends Extension
}
$this->registerAnnotationsConfiguration($config['annotations'], $container, $loader);
- $this->registerPropertyAccessConfiguration($config['property_access'], $container);
+ $this->registerPropertyAccessConfiguration($config['property_access'], $container, $loader);
if (isset($config['serializer'])) {
$this->registerSerializerConfiguration($config['serializer'], $container, $loader);
@@ -781,8 +778,14 @@ class FrameworkExtension extends Extension
}
}
- private function registerPropertyAccessConfiguration(array $config, ContainerBuilder $container)
+ private function registerPropertyAccessConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
{
+ if (!class_exists('Symfony\Component\PropertyAccess\PropertyAccessor')) {
+ return;
+ }
+
+ $loader->load('property_access.xml');
+
$container
->getDefinition('property_accessor')
->replaceArgument(0, $config['magic_call'])
@@ -813,6 +816,11 @@ class FrameworkExtension extends Extension
$loader->load('serializer.xml');
$chainLoader = $container->getDefinition('serializer.mapping.chain_loader');
+ if (!class_exists('Symfony\Component\PropertyAccess\PropertyAccessor')) {
+ $container->removeAlias('serializer.property_accessor');
+ $container->removeDefinition('serializer.normalizer.object');
+ }
+
$serializerLoaders = array();
if (isset($config['enable_annotations']) && $config['enable_annotations']) {
$annotationLoader = new Definition(
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.lb.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.lb.xlf
index d631797018..668b2a631e 100644
--- a/src/Symfony/Component/Validator/Resources/translations/validators.lb.xlf
+++ b/src/Symfony/Component/Validator/Resources/translations/validators.lb.xlf
@@ -140,7 +140,7 @@
- Dëse Wäert aentsprécht kenger gëlteger Sprooch.
+ Dëse Wäert entsprécht kenger gëlteger Sprooch.
@@ -180,7 +180,7 @@
- Dëse Wäert sollt exactly {{ limit }} Buschtaf hunn.|Dëse Wäert sollt exakt {{ limit }} Buschtawen hunn.
+ Dëse Wäert sollt exakt {{ limit }} Buschtaf hunn.|Dëse Wäert sollt exakt {{ limit }} Buschtawen hunn.
@@ -192,7 +192,7 @@
- Et gouf keen temporären Dossier an der php.ini konfiguréiert.
+ Et gouf keen temporären Dossier an der php.ini konfiguréiert oder den temporären Dossier existéiert net.
@@ -304,7 +304,7 @@
- Den Domain-Numm konnt net opgeléist ginn.
+ Den Host-Numm konnt net opgeléist ginn.