diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #23794 [PropertyInfo] allow phpdocumentor/reflection-docblock >=3.2.1 (xabbuh)

Browse Source 
This PR was merged into the 3.3 branch.

Discussion
----------

[PropertyInfo] allow phpdocumentor/reflection-docblock >=3.2.1

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | phpDocumentor/ReflectionDocBlock#108
| License       | MIT
| Doc PR        |

Commits
-------

2f3ac8f53e allow phpdocumentor/reflection-docblock >=3.2.1
This commit is contained in:
Fabien Potencier 2017-08-05 19:50:41 +02:00
commit 84b6593cd1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -102,7 +102,7 @@
"sensio/framework-extra-bundle": "^3.0.2"
},
"conflict": {
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0",
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.1",
"phpdocumentor/type-resolver": "<0.2.0",
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
},

2
src/Symfony/Component/PropertyInfo/composer.json
View File

@ -34,7 +34,7 @@
"doctrine/annotations": "~1.0"
},
"conflict": {
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0",
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.1",
"phpdocumentor/type-resolver": "<0.2.0",
"symfony/dependency-injection": "<3.3"
},