Skip to content

Commit

Permalink
minor #21309 [Serializer] Add missing conflict for property-info<3.1 …
Browse files Browse the repository at this point in the history
…(chalasr)

This PR was merged into the 3.1 branch.

Discussion
----------

[Serializer] Add missing conflict for property-info<3.1

| Q             | A
| ------------- | ---
| Branch?       | 3.1
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #21293 (comment)
| License       | MIT
| Doc PR        | n/a

Commits
-------

60a0c4b [Serializer] Add missing conflict for property-info<3.1
  • Loading branch information
nicolas-grekas committed Jan 24, 2017
2 parents 4268aba + 60a0c4b commit dd42d72
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/Symfony/Component/Serializer/composer.json
Expand Up @@ -30,7 +30,8 @@
"phpdocumentor/reflection-docblock": "~3.0"
},
"conflict": {
"symfony/property-access": ">=3.0,<3.0.4|>=2.8,<2.8.4"
"symfony/property-access": ">=3.0,<3.0.4|>=2.8,<2.8.4",
"symfony/property-info": "<3.1"
},
"suggest": {
"psr/cache-implementation": "For using the metadata cache.",
Expand Down

0 comments on commit dd42d72

Please sign in to comment.