Merge branch '3.1' into 3.2
* 3.1: [Serializer] Add missing conflict for property-info<3.1
This commit is contained in:
commit
6bcc2c3820
@ -31,6 +31,7 @@
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/property-access": ">=3.0,<3.0.4|>=2.8,<2.8.4",
|
||||
"symfony/property-info": "<3.1",
|
||||
"symfony/yaml": "<3.1"
|
||||
},
|
||||
"suggest": {
|
||||
|
@ -289,7 +289,7 @@ stream resource {@{$ref}
|
||||
%sTemplate.php:%d: {
|
||||
: try {
|
||||
: \$this->display(\$context);
|
||||
: } catch (Exception \$e) {
|
||||
: } catch (%s \$e) {
|
||||
}
|
||||
%sCliDumperTest.php:{$line}: {
|
||||
: }
|
||||
|
Reference in New Issue
Block a user