bug #23549 [PropertyInfo] conflict for phpdocumentor/reflection-docblock 3.2 (xabbuh)
This PR was merged into the 3.2 branch.
Discussion
----------
[PropertyInfo] conflict for phpdocumentor/reflection-docblock 3.2
| Q | A
| ------------- | ---
| Branch? | 3.2
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | MIT
| Doc PR |
`phpdocumentor/reflection-docblock` included a change in release 3.2.0
which required a tag to be followed by a space. This conflicts with our
use of the `@Group` annotation:
```php
/**
* @var \DateTime[]
* @Groups({"a", "b"})
*/
public $collection;
```
Commits
-------
58d49f71f1
conflict for phpdocumentor/reflection-docblock 3.2
This commit is contained in:
commit
09446473f9
@ -95,7 +95,7 @@
|
||||
"sensio/framework-extra-bundle": "^3.0.2"
|
||||
},
|
||||
"conflict": {
|
||||
"phpdocumentor/reflection-docblock": "<3.0",
|
||||
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0",
|
||||
"phpdocumentor/type-resolver": "<0.2.0",
|
||||
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
|
||||
},
|
||||
|
@ -33,7 +33,7 @@
|
||||
"doctrine/annotations": "~1.0"
|
||||
},
|
||||
"conflict": {
|
||||
"phpdocumentor/reflection-docblock": "<3.0",
|
||||
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0",
|
||||
"phpdocumentor/type-resolver": "<0.2.0"
|
||||
},
|
||||
"suggest": {
|
||||
|
Reference in New Issue
Block a user