Skip to content

Commit 30e2a5c

Browse files
dunglasfabpot
authored andcommitted
[FrameworkBundle] Fix PropertyInfo registration when using reflection-docblock 3
1 parent fb46f24 commit 30e2a5c

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ private function registerPropertyInfoConfiguration(array $config, ContainerBuild
10101010

10111011
$loader->load('property_info.xml');
10121012

1013-
if (class_exists('phpDocumentor\Reflection\ClassReflector')) {
1013+
if (class_exists('phpDocumentor\Reflection\DocBlockFactoryInterface')) {
10141014
$definition = $container->register('property_info.php_doc_extractor', 'Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor');
10151015
$definition->addTag('property_info.description_extractor', array('priority' => -1000));
10161016
$definition->addTag('property_info.type_extractor', array('priority' => -1001));

composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,10 @@
5050
"symfony/validator": "~2.8|~3.0",
5151
"symfony/yaml": "~2.8|~3.0",
5252
"symfony/property-info": "~2.8|~3.0",
53-
"phpdocumentor/reflection": "^1.0.7"
53+
"phpdocumentor/reflection-docblock": "^3.0"
54+
},
55+
"conflict": {
56+
"phpdocumentor/reflection-docblock": "<3.0"
5457
},
5558
"suggest": {
5659
"symfony/console": "For using the console commands",

0 commit comments

Comments
 (0)