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

conflict for phpdocumentor/reflection-docblock 3.2

Browse Source 
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;
```
This commit is contained in:
Christian Flothmann 2017-07-17 17:30:29 +02:00
parent d3ca5083bf
commit 58d49f71f1
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

@ -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"
},

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

@ -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": {