[FWBundle] Throw if PropertyInfo is enabled, but the component isn't installed

dunglas · dunglas · commit 41fd0a881e31 · 2018-10-02T17:56:33.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -61,6 +61,7 @@
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 use Symfony\Component\PropertyInfo\PropertyAccessExtractorInterface;
 use Symfony\Component\PropertyInfo\PropertyDescriptionExtractorInterface;
+use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface;
 use Symfony\Component\PropertyInfo\PropertyListExtractorInterface;
 use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
 use Symfony\Component\Routing\Loader\AnnotationDirectoryLoader;
@@ -296,7 +297,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         if ($this->isConfigEnabled($container, $config['property_info'])) {
-            $this->registerPropertyInfoConfiguration($config['property_info'], $container, $loader);
+            $this->registerPropertyInfoConfiguration($container, $loader);
         }
 
         if ($this->isConfigEnabled($container, $config['lock'])) {
@@ -1543,8 +1544,12 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
         }
     }
 
-    private function registerPropertyInfoConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
+    private function registerPropertyInfoConfiguration(ContainerBuilder $container, XmlFileLoader $loader)
     {
+        if (!interface_exists(PropertyInfoExtractorInterface::class)) {
+            throw new LogicException('PropertyInfo support cannot be enabled as the PropertyInfo component is not installed. Try running "composer require symfony/property-info".');
+        }
+
         $loader->load('property_info.xml');
 
         $container->getDefinition('property_info')->setPrivate(true);

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@`
`61`	`61`	`use Symfony\Component\PropertyAccess\PropertyAccessor;`
`62`	`62`	`use Symfony\Component\PropertyInfo\PropertyAccessExtractorInterface;`
`63`	`63`	`use Symfony\Component\PropertyInfo\PropertyDescriptionExtractorInterface;`
	`64`	`+use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface;`
`64`	`65`	`use Symfony\Component\PropertyInfo\PropertyListExtractorInterface;`
`65`	`66`	`use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;`
`66`	`67`	`use Symfony\Component\Routing\Loader\AnnotationDirectoryLoader;`
`@@ -296,7 +297,7 @@ public function load(array $configs, ContainerBuilder $container)`
`296`	`297`	`}`
`297`	`298`
`298`	`299`	`if ($this->isConfigEnabled($container, $config['property_info'])) {`
`299`		`- $this->registerPropertyInfoConfiguration($config['property_info'], $container, $loader);`
	`300`	`+ $this->registerPropertyInfoConfiguration($container, $loader);`
`300`	`301`	`}`
`301`	`302`
`302`	`303`	`if ($this->isConfigEnabled($container, $config['lock'])) {`
`@@ -1543,8 +1544,12 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder`
`1543`	`1544`	`}`
`1544`	`1545`	`}`
`1545`	`1546`
`1546`		`- private function registerPropertyInfoConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)`
	`1547`	`+ private function registerPropertyInfoConfiguration(ContainerBuilder $container, XmlFileLoader $loader)`
`1547`	`1548`	`{`
	`1549`	`+ if (!interface_exists(PropertyInfoExtractorInterface::class)) {`
	`1550`	`+ throw new LogicException('PropertyInfo support cannot be enabled as the PropertyInfo component is not installed. Try running "composer require symfony/property-info".');`
	`1551`	`+ }`
	`1552`	`+`
`1548`	`1553`	`$loader->load('property_info.xml');`
`1549`	`1554`
`1550`	`1555`	`$container->getDefinition('property_info')->setPrivate(true);`