[FrameworkBundle] Expose configuration of PropertyAccess

lyrixx · lyrixx · commit eac64c309ee2 · 2014-08-22T11:11:42.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * Added `Controller::isCsrfTokenValid` helper
+ * Added configuration for the PropertyAccess component
 
 2.5.0
 -----
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -92,6 +92,7 @@ public function getConfigTreeBuilder()
         $this->addValidationSection($rootNode);
         $this->addAnnotationsSection($rootNode);
         $this->addSerializerSection($rootNode);
+        $this->addPropertyAccessSection($rootNode);
 
         return $treeBuilder;
     }
@@ -524,4 +525,20 @@ private function addSerializerSection(ArrayNodeDefinition $rootNode)
             ->end()
         ;
     }
+
+    private function addPropertyAccessSection(ArrayNodeDefinition $rootNode)
+    {
+        $rootNode
+            ->children()
+                ->arrayNode('property_access')
+                    ->addDefaultsIfNotSet()
+                    ->info('Property access configuration')
+                    ->children()
+                        ->booleanNode('magic_call')->defaultFalse()->end()
+                        ->booleanNode('throw_exception_on_invalid_index')->defaultFalse()->end()
+                    ->end()
+                ->end()
+            ->end()
+        ;
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -133,6 +133,8 @@ public function load(array $configs, ContainerBuilder $container)
 
         $this->registerAnnotationsConfiguration($config['annotations'], $container, $loader);
 
+        $this->registerPropertyAccessConfiguration($config['property_access'], $container);
+
         if (isset($config['serializer']) && $config['serializer']['enabled']) {
             $loader->load('serializer.xml');
         }
@@ -818,6 +820,15 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
         }
     }
 
+    private function registerPropertyAccessConfiguration(array $config, ContainerBuilder $container)
+    {
+        $container
+            ->getDefinition('property_accessor')
+            ->replaceArgument(0, $config['magic_call'])
+            ->replaceArgument(1, $config['throw_exception_on_invalid_index'])
+        ;
+    }
+
     /**
      * Loads the security configuration.
      *
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_access.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_access.xml
@@ -9,6 +9,9 @@
     </parameters>
 
     <services>
-        <service id="property_accessor" class="%property_accessor.class%" />
+        <service id="property_accessor" class="%property_accessor.class%" >
+            <argument /> <!-- magicCall, set by the extension -->
+            <argument /> <!-- throwExceptionOnInvalidIndex, set by the extension -->
+        </service>
     </services>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -177,4 +177,9 @@
         <xsd:attribute name="debug" type="xsd:string" />
         <xsd:attribute name="file-cache-dir" type="xsd:string" />
     </xsd:complexType>
+
+    <xsd:complexType name="property_access">
+        <xsd:attribute name="magic_call" type="xsd:boolean" />
+        <xsd:attribute name="throw_exception_on_invalid_index" type="xsd:boolean" />
+    </xsd:complexType>
 </xsd:schema>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -139,7 +139,11 @@ protected static function getBundleDefaultConfig()
             ),
             'serializer'          => array(
                 'enabled' => false
-            )
+            ),
+            'property_access' => array(
+                'magic_call' => false,
+                'throw_exception_on_invalid_index' => false,
+            ),
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,8 @@ public function load(array $configs, ContainerBuilder $container)`
`133`	`133`
`134`	`134`	`$this->registerAnnotationsConfiguration($config['annotations'], $container, $loader);`
`135`	`135`
	`136`	`+ $this->registerPropertyAccessConfiguration($config['property_access'], $container);`
	`137`	`+`
`136`	`138`	`if (isset($config['serializer']) && $config['serializer']['enabled']) {`
`137`	`139`	`$loader->load('serializer.xml');`
`138`	`140`	`}`
`@@ -818,6 +820,15 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde`
`818`	`820`	`}`
`819`	`821`	`}`
`820`	`822`
	`823`	`+ private function registerPropertyAccessConfiguration(array $config, ContainerBuilder $container)`
	`824`	`+ {`
	`825`	`+ $container`
	`826`	`+ ->getDefinition('property_accessor')`
	`827`	`+ ->replaceArgument(0, $config['magic_call'])`
	`828`	`+ ->replaceArgument(1, $config['throw_exception_on_invalid_index'])`
	`829`	`+ ;`
	`830`	`+ }`
	`831`	`+`
`821`	`832`	`/**`
`822`	`833`	`* Loads the security configuration.`
`823`	`834`	`*`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,11 @@ protected static function getBundleDefaultConfig()`
`139`	`139`	`),`
`140`	`140`	`'serializer' => array(`
`141`	`141`	`'enabled' => false`
`142`		`- )`
	`142`	`+ ),`
	`143`	`+ 'property_access' => array(`
	`144`	`+ 'magic_call' => false,`
	`145`	`+ 'throw_exception_on_invalid_index' => false,`
	`146`	`+ ),`
`143`	`147`	`);`
`144`	`148`	`}`
`145`	`149`	`}`