commit 0b431ce77c65690f65b7e967bd044f300b32f173
parent fc4aab0f95ce90401404e18756627b118f2aea34
Author: Felicitus <felicitus@felicitus.org>
Date: Fri, 17 Jul 2015 01:13:45 +0200
Removed the symfony serializer from the requirements, as it is pulled in by the DunglasAPIBundle by default
Diffstat:
2 files changed, 42 insertions(+), 43 deletions(-)
diff --git a/composer.json b/composer.json
@@ -41,7 +41,6 @@
"doctrine/doctrine-fixtures-bundle": "2.2.*",
"symfony/doctrine-bridge": "2.7.x-dev",
"dunglas/api-bundle": "1.0.*@dev",
- "symfony/serializer": "2.7.1",
"brainbits/fugue-icons-bundle": "^3.5",
"imagine/imagine": "^0.6.2",
"ramsey/uuid": "dev-master",
diff --git a/composer.lock b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "ca8731155fcfd71b751d51f7373b28a5",
+ "hash": "ac03d457735e05a64fe83e65feb4c8db",
"packages": [
{
"name": "behat/transliterator",
@@ -1242,12 +1242,12 @@
"source": {
"type": "git",
"url": "https://github.com/dunglas/DunglasApiBundle.git",
- "reference": "04922993be1e1f082de81435160897abb87da12c"
+ "reference": "2229fcf0a32c17af89732fac58d47854a10a5214"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dunglas/DunglasApiBundle/zipball/04922993be1e1f082de81435160897abb87da12c",
- "reference": "04922993be1e1f082de81435160897abb87da12c",
+ "url": "https://api.github.com/repos/dunglas/DunglasApiBundle/zipball/2229fcf0a32c17af89732fac58d47854a10a5214",
+ "reference": "2229fcf0a32c17af89732fac58d47854a10a5214",
"shasum": ""
},
"require": {
@@ -1260,7 +1260,7 @@
"phpdocumentor/reflection": "^1.0.7",
"symfony/framework-bundle": "~2.6|~3.0",
"symfony/proxy-manager-bridge": "~2.3",
- "symfony/serializer": "~2.7|~3.0",
+ "symfony/serializer": "^2.7.2|~3.0",
"symfony/validator": "~2.5|~3.0"
},
"require-dev": {
@@ -1308,7 +1308,7 @@
"json",
"rest"
],
- "time": "2015-07-09 12:53:29"
+ "time": "2015-07-15 14:19:51"
},
{
"name": "dunglas/php-property-info",
@@ -1860,16 +1860,16 @@
},
{
"name": "monolog/monolog",
- "version": "1.14.0",
+ "version": "1.15.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "b287fbbe1ca27847064beff2bad7fb6920bf08cc"
+ "reference": "dc5150cc608f2334c72c3b6a553ec9668a4156b0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/b287fbbe1ca27847064beff2bad7fb6920bf08cc",
- "reference": "b287fbbe1ca27847064beff2bad7fb6920bf08cc",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/dc5150cc608f2334c72c3b6a553ec9668a4156b0",
+ "reference": "dc5150cc608f2334c72c3b6a553ec9668a4156b0",
"shasum": ""
},
"require": {
@@ -1906,7 +1906,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.14.x-dev"
+ "dev-master": "1.15.x-dev"
}
},
"autoload": {
@@ -1932,7 +1932,7 @@
"logging",
"psr-3"
],
- "time": "2015-06-19 13:29:54"
+ "time": "2015-07-12 13:54:09"
},
{
"name": "moontoast/math",
@@ -2332,12 +2332,12 @@
"source": {
"type": "git",
"url": "https://github.com/ramsey/uuid.git",
- "reference": "94ea59389111ceadf5f9ed2d1c658b0e35f4525d"
+ "reference": "32d2a7ffe9aca7370c98f092f86c0e16f2b2d15b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ramsey/uuid/zipball/94ea59389111ceadf5f9ed2d1c658b0e35f4525d",
- "reference": "94ea59389111ceadf5f9ed2d1c658b0e35f4525d",
+ "url": "https://api.github.com/repos/ramsey/uuid/zipball/32d2a7ffe9aca7370c98f092f86c0e16f2b2d15b",
+ "reference": "32d2a7ffe9aca7370c98f092f86c0e16f2b2d15b",
"shasum": ""
},
"require": {
@@ -2387,7 +2387,7 @@
{
"name": "Ben Ramsey",
"email": "ben@benramsey.com",
- "homepage": "http://benramsey.com"
+ "homepage": "https://benramsey.com"
}
],
"description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
@@ -2397,7 +2397,7 @@
"identifier",
"uuid"
],
- "time": "2015-06-22 01:20:55"
+ "time": "2015-07-16 18:03:15"
},
{
"name": "sensio/distribution-bundle",
@@ -2792,12 +2792,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/DoctrineBridge.git",
- "reference": "aa7eb6751902df204c281186c2db414d154e088e"
+ "reference": "ebb229c16d04ef5548551a1294d3a7c219ef39ca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/DoctrineBridge/zipball/aa7eb6751902df204c281186c2db414d154e088e",
- "reference": "aa7eb6751902df204c281186c2db414d154e088e",
+ "url": "https://api.github.com/repos/symfony/DoctrineBridge/zipball/ebb229c16d04ef5548551a1294d3a7c219ef39ca",
+ "reference": "ebb229c16d04ef5548551a1294d3a7c219ef39ca",
"shasum": ""
},
"require": {
@@ -2853,7 +2853,7 @@
],
"description": "Symfony Doctrine Bridge",
"homepage": "https://symfony.com",
- "time": "2015-06-28 17:13:14"
+ "time": "2015-07-14 18:21:52"
},
{
"name": "symfony/monolog-bundle",
@@ -2973,16 +2973,16 @@
},
{
"name": "symfony/symfony",
- "version": "v2.7.1",
+ "version": "v2.7.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/symfony.git",
- "reference": "932b6e7499c670f4db6d0b871477a4a3ca161e74"
+ "reference": "969d709ad428076bf1084e386dc26dd904d9fb84"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/symfony/zipball/932b6e7499c670f4db6d0b871477a4a3ca161e74",
- "reference": "932b6e7499c670f4db6d0b871477a4a3ca161e74",
+ "url": "https://api.github.com/repos/symfony/symfony/zipball/969d709ad428076bf1084e386dc26dd904d9fb84",
+ "reference": "969d709ad428076bf1084e386dc26dd904d9fb84",
"shasum": ""
},
"require": {
@@ -3091,7 +3091,7 @@
"keywords": [
"framework"
],
- "time": "2015-06-11 21:15:28"
+ "time": "2015-07-13 19:27:49"
},
{
"name": "twig/extensions",
@@ -3346,20 +3346,20 @@
},
{
"name": "zendframework/zend-eventmanager",
- "version": "2.5.1",
+ "version": "2.5.2",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-eventmanager.git",
- "reference": "d94a16039144936f107f906896349900fd634443"
+ "reference": "135af03d07fd048c322259aab6611d2be290475c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/d94a16039144936f107f906896349900fd634443",
- "reference": "d94a16039144936f107f906896349900fd634443",
+ "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/135af03d07fd048c322259aab6611d2be290475c",
+ "reference": "135af03d07fd048c322259aab6611d2be290475c",
"shasum": ""
},
"require": {
- "php": ">=5.3.23",
+ "php": ">=5.5",
"zendframework/zend-stdlib": "~2.5"
},
"require-dev": {
@@ -3387,7 +3387,7 @@
"eventmanager",
"zf2"
],
- "time": "2015-06-03 15:32:01"
+ "time": "2015-07-16 19:00:49"
},
{
"name": "zendframework/zend-stdlib",
@@ -3719,16 +3719,16 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "2.1.7",
+ "version": "2.1.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "07e27765596d72c378a6103e80da5d84e802f1e4"
+ "reference": "6044546998c7627ab997501a3d0db972b3db9790"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/07e27765596d72c378a6103e80da5d84e802f1e4",
- "reference": "07e27765596d72c378a6103e80da5d84e802f1e4",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6044546998c7627ab997501a3d0db972b3db9790",
+ "reference": "6044546998c7627ab997501a3d0db972b3db9790",
"shasum": ""
},
"require": {
@@ -3777,7 +3777,7 @@
"testing",
"xunit"
],
- "time": "2015-06-30 06:52:35"
+ "time": "2015-07-13 11:25:58"
},
{
"name": "phpunit/php-file-iterator",
@@ -3959,16 +3959,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "4.7.6",
+ "version": "4.7.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "0ebabb4cda7d066be8391dfdbaf57fe70ac9a99b"
+ "reference": "9b97f9d807b862c2de2a36e86690000801c85724"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0ebabb4cda7d066be8391dfdbaf57fe70ac9a99b",
- "reference": "0ebabb4cda7d066be8391dfdbaf57fe70ac9a99b",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9b97f9d807b862c2de2a36e86690000801c85724",
+ "reference": "9b97f9d807b862c2de2a36e86690000801c85724",
"shasum": ""
},
"require": {
@@ -4027,7 +4027,7 @@
"testing",
"xunit"
],
- "time": "2015-06-30 06:53:57"
+ "time": "2015-07-13 11:28:34"
},
{
"name": "phpunit/phpunit-mock-objects",
