Skip to content

Commit

Permalink
minor #17931 [FrameworkBundle] Fix PropertyInfo registration when usi…
Browse files Browse the repository at this point in the history
…ng reflection-docblock 3 (dunglas)

This PR was squashed before being merged into the 3.1-dev branch (closes #17931).

Discussion
----------

[FrameworkBundle] Fix PropertyInfo registration when using reflection-docblock 3

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | yes
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Currently, the PHPDoc extractor of PropertyInfo is not registered anymore because #17531 was merged.

Commits
-------

6d31365 [FrameworkBundle] Fix PropertyInfo registration when using reflection-docblock 3
  • Loading branch information
fabpot committed Feb 29, 2016
2 parents db16d52 + 6d31365 commit c55baba
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
Expand Up @@ -1010,7 +1010,7 @@ private function registerPropertyInfoConfiguration(array $config, ContainerBuild

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

if (class_exists('phpDocumentor\Reflection\ClassReflector')) {
if (class_exists('phpDocumentor\Reflection\DocBlockFactoryInterface')) {
$definition = $container->register('property_info.php_doc_extractor', 'Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor');
$definition->addTag('property_info.description_extractor', array('priority' => -1000));
$definition->addTag('property_info.type_extractor', array('priority' => -1001));
Expand Down
5 changes: 4 additions & 1 deletion src/Symfony/Bundle/FrameworkBundle/composer.json
Expand Up @@ -50,7 +50,10 @@
"symfony/validator": "~2.8|~3.0",
"symfony/yaml": "~2.8|~3.0",
"symfony/property-info": "~2.8|~3.0",
"phpdocumentor/reflection": "^1.0.7"
"phpdocumentor/reflection-docblock": "^3.0"
},
"conflict": {
"phpdocumentor/reflection-docblock": "<3.0"
},
"suggest": {
"symfony/console": "For using the console commands",
Expand Down

0 comments on commit c55baba

Please sign in to comment.