8000 minor #23794 [PropertyInfo] allow phpdocumentor/reflection-docblock >… · symfony/symfony@84b6593 · GitHub
[go: up one dir, main page]
Skip to content

Commit 84b6593

Browse files
fabpotfabpot
committed
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 ------- 2f3ac8f allow phpdocumentor/reflection-docblock >=3.2.1
2 parents c099f58 + 2f3ac8f commit 84b6593

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"sensio/framework-extra-bundle": "^3.0.2"
103103
},
104104
"conflict": {
105-
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0",
105+
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.1",
106106
"phpdocumentor/type-resolver": "<0.2.0",
107107
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
108108
},

‎src/Symfony/Component/PropertyInfo/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"doctrine/annotations": "~1.0"
3535
},
3636
"conflict": {
37-
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0",
37+
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.1",
3838
"phpdocumentor/type-resolver": "<0.2.0",
3939
"symfony/dependency-injection": "<3.3"
4040
},

0 commit comments

Comments
 (0)
0