minor #23794 [PropertyInfo] allow phpdocumentor/reflection-docblock >=3.2.1 (xabbuh)
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:
commit
84b6593cd1
@ -102,7 +102,7 @@
|
|||||||
"sensio/framework-extra-bundle": "^3.0.2"
|
"sensio/framework-extra-bundle": "^3.0.2"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"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",
|
"phpdocumentor/type-resolver": "<0.2.0",
|
||||||
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
|
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
|
||||||
},
|
},
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
"doctrine/annotations": "~1.0"
|
"doctrine/annotations": "~1.0"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"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",
|
"phpdocumentor/type-resolver": "<0.2.0",
|
||||||
"symfony/dependency-injection": "<3.3"
|
"symfony/dependency-injection": "<3.3"
|
||||||
},
|
},
|
||||||
|
Reference in New Issue
Block a user