diff options
author | Remi Collet <remi@remirepo.net> | 2020-08-18 08:26:19 +0200 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2020-08-18 08:26:19 +0200 |
commit | 7b4527fe3dcc6f1bbafef19a4c0e6786ec239944 (patch) | |
tree | 064d66d77172a287cd4b3fb79a463b459e8e27bb /composer.json | |
parent | 8b8d5b62dcebaaee730ec4def23a5b6b1edb6b7f (diff) |
sync with fedora
Diffstat (limited to 'composer.json')
-rw-r--r-- | composer.json | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/composer.json b/composer.json index 13251ad..62caf3d 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.", "keywords": ["serialization", "deserialization", "json", "jaxb", "xml"], "homepage": "http://jmsyst.com/libs/serializer", - "license": "Apache-2.0", + "license": "MIT", "authors": [ { "name": "Johannes M. Schmitt", @@ -16,8 +16,8 @@ } ], "require": { - "php": ">=5.5.0", - "jms/metadata": "~1.1", + "php": "^5.5|^7.0", + "jms/metadata": "^1.3", "jms/parser-lib": "1.*", "phpoption/phpoption": "^1.1", "phpcollection/phpcollection": "~0.1", @@ -25,7 +25,6 @@ "doctrine/instantiator": "^1.0.3" }, "conflict": { - "jms/serializer-bundle": "<1.2.1", "twig/twig": "<1.12" }, "suggest": { @@ -62,7 +61,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.10-dev" + "dev-1.x": "1.14-dev" } } } |