diff options
-rw-r--r-- | composer.lock | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/composer.lock b/composer.lock index e6bc6c13..230419b2 100644 --- a/composer.lock +++ b/composer.lock | |||
@@ -1972,16 +1972,16 @@ | |||
1972 | }, | 1972 | }, |
1973 | { | 1973 | { |
1974 | "name": "friendsofsymfony/rest-bundle", | 1974 | "name": "friendsofsymfony/rest-bundle", |
1975 | "version": "2.7.4", | 1975 | "version": "2.8.0", |
1976 | "source": { | 1976 | "source": { |
1977 | "type": "git", | 1977 | "type": "git", |
1978 | "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", | 1978 | "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", |
1979 | "reference": "3d8501dbdfa48811ef942f5f93c358c80d5ad8eb" | 1979 | "reference": "cc53e997761a56f657d2cae2d49e91dd64a7da76" |
1980 | }, | 1980 | }, |
1981 | "dist": { | 1981 | "dist": { |
1982 | "type": "zip", | 1982 | "type": "zip", |
1983 | "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/3d8501dbdfa48811ef942f5f93c358c80d5ad8eb", | 1983 | "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/cc53e997761a56f657d2cae2d49e91dd64a7da76", |
1984 | "reference": "3d8501dbdfa48811ef942f5f93c358c80d5ad8eb", | 1984 | "reference": "cc53e997761a56f657d2cae2d49e91dd64a7da76", |
1985 | "shasum": "" | 1985 | "shasum": "" |
1986 | }, | 1986 | }, |
1987 | "require": { | 1987 | "require": { |
@@ -2002,6 +2002,7 @@ | |||
2002 | "willdurand/negotiation": "^2.0" | 2002 | "willdurand/negotiation": "^2.0" |
2003 | }, | 2003 | }, |
2004 | "conflict": { | 2004 | "conflict": { |
2005 | "doctrine/inflector": "1.4.0", | ||
2005 | "jms/serializer": "<1.13.0", | 2006 | "jms/serializer": "<1.13.0", |
2006 | "jms/serializer-bundle": "<2.0.0", | 2007 | "jms/serializer-bundle": "<2.0.0", |
2007 | "sensio/framework-extra-bundle": "<3.0.13" | 2008 | "sensio/framework-extra-bundle": "<3.0.13" |
@@ -2037,6 +2038,7 @@ | |||
2037 | "type": "symfony-bundle", | 2038 | "type": "symfony-bundle", |
2038 | "extra": { | 2039 | "extra": { |
2039 | "branch-alias": { | 2040 | "branch-alias": { |
2041 | "2.x-dev": "2.8-dev", | ||
2040 | "dev-master": "2.7-dev" | 2042 | "dev-master": "2.7-dev" |
2041 | } | 2043 | } |
2042 | }, | 2044 | }, |
@@ -2072,7 +2074,7 @@ | |||
2072 | "keywords": [ | 2074 | "keywords": [ |
2073 | "rest" | 2075 | "rest" |
2074 | ], | 2076 | ], |
2075 | "time": "2020-04-23T17:34:09+00:00" | 2077 | "time": "2020-06-03T06:41:50+00:00" |
2076 | }, | 2078 | }, |
2077 | { | 2079 | { |
2078 | "name": "friendsofsymfony/user-bundle", | 2080 | "name": "friendsofsymfony/user-bundle", |