Skip to content

Commit af0b24e

Browse files
bug symfony#23897 Allow phpdocumentor/reflection-docblock 4 (derrabus)
This PR was merged into the 3.3 branch. Discussion ---------- Allow phpdocumentor/reflection-docblock 4 | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | none | License | MIT | Doc PR | N/A The PHPDocumentor team bumped their reflection-docblock library to version 4 due to a breaking change that should not affect Symfony, as far as I can tell. This PR indicates compatibility with the new major version. Commits ------- 1a5fd79 Allow phpdocumentor/reflection-docblock 4.
2 parents d32c706 + 1a5fd79 commit af0b24e

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
"symfony/phpunit-bridge": "~3.2",
9999
"symfony/polyfill-apcu": "~1.1",
100100
"symfony/security-acl": "~2.8|~3.0",
101-
"phpdocumentor/reflection-docblock": "^3.0",
101+
"phpdocumentor/reflection-docblock": "^3.0|^4.0",
102102
"sensio/framework-extra-bundle": "^3.0.2"
103103
},
104104
"conflict": {

src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"symfony/property-info": "~3.3",
5656
"symfony/web-link": "~3.3",
5757
"doctrine/annotations": "~1.0",
58-
"phpdocumentor/reflection-docblock": "^3.0",
58+
"phpdocumentor/reflection-docblock": "^3.0|^4.0",
5959
"twig/twig": "~1.34|~2.4",
6060
"sensio/framework-extra-bundle": "^3.0.2"
6161
},

src/Symfony/Component/PropertyInfo/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"symfony/serializer": "~2.8|~3.0",
3131
"symfony/cache": "~3.1",
3232
"symfony/dependency-injection": "~3.3",
33-
"phpdocumentor/reflection-docblock": "^3.0",
33+
"phpdocumentor/reflection-docblock": "^3.0|^4.0",
3434
"doctrine/annotations": "~1.0"
3535
},
3636
"conflict": {

src/Symfony/Component/Serializer/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"doctrine/annotations": "~1.0",
2929
"symfony/dependency-injection": "~3.2",
3030
"doctrine/cache": "~1.0",
31-
"phpdocumentor/reflection-docblock": "~3.0"
31+
"phpdocumentor/reflection-docblock": "^3.0|^4.0"
3232
},
3333
"conflict": {
3434
"symfony/dependency-injection": "<3.2",

0 commit comments

Comments
 (0)