use bitwise flags to configure when the property accessor should throw

Author: xabbuh

DependencyInjection/FrameworkExtension.php

@@ -1573,13 +1573,16 @@ private function registerPropertyAccessConfiguration(array $config, ContainerBui
         $magicMethods |= $config['magic_get'] ? PropertyAccessor::MAGIC_GET : 0;
         $magicMethods |= $config['magic_set'] ? PropertyAccessor::MAGIC_SET : 0;
 
+        $throw = PropertyAccessor::DO_NOT_THROW;
+        $throw |= $config['throw_exception_on_invalid_index'] ? PropertyAccessor::THROW_ON_INVALID_INDEX : 0;
+        $throw |= $config['throw_exception_on_invalid_property_path'] ? PropertyAccessor::THROW_ON_INVALID_PROPERTY_PATH : 0;
+
         $container
             ->getDefinition('property_accessor')
             ->replaceArgument(0, $magicMethods)
-            ->replaceArgument(1, $config['throw_exception_on_invalid_index'])
-            ->replaceArgument(3, $config['throw_exception_on_invalid_property_path'])
-            ->replaceArgument(4, new Reference(PropertyReadInfoExtractorInterface::class, ContainerInterface::NULL_ON_INVALID_REFERENCE))
-            ->replaceArgument(5, new Reference(PropertyWriteInfoExtractorInterface::class, ContainerInterface::NULL_ON_INVALID_REFERENCE))
+            ->replaceArgument(1, $throw)
+            ->replaceArgument(3, new Reference(PropertyReadInfoExtractorInterface::class, ContainerInterface::NULL_ON_INVALID_REFERENCE))
+            ->replaceArgument(4, new Reference(PropertyWriteInfoExtractorInterface::class, ContainerInterface::NULL_ON_INVALID_REFERENCE))
         ;
     }
 

Resources/config/property_access.php

@@ -19,9 +19,8 @@
         ->set('property_accessor', PropertyAccessor::class)
             ->args([
                 abstract_arg('magic methods allowed, set by the extension'),
-                abstract_arg('throwExceptionOnInvalidIndex, set by the extension'),
+                abstract_arg('throw exceptions, set by the extension'),
                 service('cache.property_access')->ignoreOnInvalid(),
-                abstract_arg('throwExceptionOnInvalidPropertyPath, set by the extension'),
                 abstract_arg('propertyReadInfoExtractor, set by the extension'),
                 abstract_arg('propertyWriteInfoExtractor, set by the extension'),
             ])

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -100,17 +100,15 @@ public function testPropertyAccessWithDefaultValue()
 
         $def = $container->getDefinition('property_accessor');
         $this->assertSame(PropertyAccessor::MAGIC_SET | PropertyAccessor::MAGIC_GET, $def->getArgument(0));
-        $this->assertFalse($def->getArgument(1));
-        $this->assertTrue($def->getArgument(3));
+        $this->assertSame(PropertyAccessor::THROW_ON_INVALID_PROPERTY_PATH, $def->getArgument(1));
     }
 
     public function testPropertyAccessWithOverriddenValues()
     {
         $container = $this->createContainerFromFile('property_accessor');
         $def = $container->getDefinition('property_accessor');
         $this->assertSame(PropertyAccessor::MAGIC_GET | PropertyAccessor::MAGIC_CALL, $def->getArgument(0));
-        $this->assertTrue($def->getArgument(1));
-        $this->assertFalse($def->getArgument(3));
+        $this->assertSame(PropertyAccessor::THROW_ON_INVALID_INDEX, $def->getArgument(1));
     }
 
     public function testPropertyAccessCache()

composer.json

@@ -84,7 +84,7 @@
         "symfony/messenger": "<4.4",
         "symfony/mime": "<4.4",
         "symfony/property-info": "<4.4",
-        "symfony/property-access": "<5.2",
+        "symfony/property-access": "<5.3",
         "symfony/serializer": "<5.2",
         "symfony/security-csrf": "<5.3",
         "symfony/security-core": "<5.3",