File tree Expand file tree Collapse file tree 4 files changed +4
-4
lines changed Expand file tree Collapse file tree 4 files changed +4
-4
lines changed Original file line number Diff line number Diff line change 98
98
"symfony/phpunit-bridge" : " ~3.2" ,
99
99
"symfony/polyfill-apcu" : " ~1.1" ,
100
100
"symfony/security-acl" : " ~2.8|~3.0" ,
101
- "phpdocumentor/reflection-docblock" : " ^3.0" ,
101
+ "phpdocumentor/reflection-docblock" : " ^3.0|^4.0 " ,
102
102
"sensio/framework-extra-bundle" : " ^3.0.2"
103
103
},
104
104
"conflict" : {
Original file line number Diff line number Diff line change 55
55
"symfony/property-info" : " ~3.3" ,
56
56
"symfony/web-link" : " ~3.3" ,
57
57
"doctrine/annotations" : " ~1.0" ,
58
- "phpdocumentor/reflection-docblock" : " ^3.0" ,
58
+ "phpdocumentor/reflection-docblock" : " ^3.0|^4.0 " ,
59
59
"twig/twig" : " ~1.34|~2.4" ,
60
60
"sensio/framework-extra-bundle" : " ^3.0.2"
61
61
},
Original file line number Diff line number Diff line change 30
30
"symfony/serializer" : " ~2.8|~3.0" ,
31
31
"symfony/cache" : " ~3.1" ,
32
32
"symfony/dependency-injection" : " ~3.3" ,
33
- "phpdocumentor/reflection-docblock" : " ^3.0" ,
33
+ "phpdocumentor/reflection-docblock" : " ^3.0|^4.0 " ,
34
34
"doctrine/annotations" : " ~1.0"
35
35
},
36
36
"conflict" : {
Original file line number Diff line number Diff line change 28
28
"doctrine/annotations" : " ~1.0" ,
29
29
"symfony/dependency-injection" : " ~3.2" ,
30
30
"doctrine/cache" : " ~1.0" ,
31
- "phpdocumentor/reflection-docblock" : " ~3 .0"
31
+ "phpdocumentor/reflection-docblock" : " ^3.0|^4 .0"
32
32
},
33
33
"conflict" : {
34
34
"symfony/dependency-injection" : " <3.2" ,
You can’t perform that action at this time.
0 commit comments