commit 0a69c4647248fa1c3a7ffa59bdc0249bfd803789
parent e1bfe67f169906976849681d29125328a4061960
Author: Felicitus <felicitus@felicitus.org>
Date: Tue, 15 Sep 2015 19:53:34 +0200
Updated dependencies
Diffstat:
2 files changed, 60 insertions(+), 59 deletions(-)
diff --git a/composer.json b/composer.json
@@ -37,7 +37,7 @@
"friendsofsymfony/rest-bundle": "~1.7.1",
"cbsi/doctrine2-nestedset": "dev-master",
"partkeepr/extjs6": "dev-master",
- "fortawesome/font-awesome": "4.3.0",
+ "fortawesome/font-awesome": "4.*",
"doctrine/doctrine-fixtures-bundle": "2.2.*",
"symfony/doctrine-bridge": "2.7.x-dev",
"dunglas/api-bundle": "dev-master",
@@ -54,7 +54,7 @@
"reputation-vip/composer-assets-installer": "^1.0"
},
"require-dev": {
- "phpunit/phpunit": "4.7.*",
+ "phpunit/phpunit": "4.8.*",
"codeclimate/php-test-reporter": "dev-master",
"liip/functional-test-bundle": "~1.1"
},
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": "a7a8cba356272970c52c8713c6421f41",
+ "hash": "2ef89820899af22468636f980cad642d",
"packages": [
{
"name": "atelierspierrot/famfamfam-silk-sprite",
@@ -1144,12 +1144,12 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/migrations.git",
- "reference": "4e85ba638acf62e1afe735f94b0c51aa971f8773"
+ "reference": "6f40d16de7a4da2fff883f2de92fdbf17e61d75d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/migrations/zipball/4e85ba638acf62e1afe735f94b0c51aa971f8773",
- "reference": "4e85ba638acf62e1afe735f94b0c51aa971f8773",
+ "url": "https://api.github.com/repos/doctrine/migrations/zipball/6f40d16de7a4da2fff883f2de92fdbf17e61d75d",
+ "reference": "6f40d16de7a4da2fff883f2de92fdbf17e61d75d",
"shasum": ""
},
"require": {
@@ -1179,8 +1179,8 @@
}
},
"autoload": {
- "psr-0": {
- "Doctrine\\DBAL\\Migrations": "lib"
+ "psr-4": {
+ "Doctrine\\DBAL\\Migrations\\": "lib/Doctrine/DBAL/Migrations"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1203,7 +1203,7 @@
"database",
"migrations"
],
- "time": "2015-08-27 12:05:11"
+ "time": "2015-09-15 13:41:30"
},
{
"name": "doctrine/orm",
@@ -1288,12 +1288,12 @@
"source": {
"type": "git",
"url": "https://github.com/dunglas/DunglasApiBundle.git",
- "reference": "7fb55b9f1599d8efa7a11d2e2228a5d67c48069a"
+ "reference": "75a917493dea335b8d20e97803ee585aa031cc92"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dunglas/DunglasApiBundle/zipball/7fb55b9f1599d8efa7a11d2e2228a5d67c48069a",
- "reference": "7fb55b9f1599d8efa7a11d2e2228a5d67c48069a",
+ "url": "https://api.github.com/repos/dunglas/DunglasApiBundle/zipball/75a917493dea335b8d20e97803ee585aa031cc92",
+ "reference": "75a917493dea335b8d20e97803ee585aa031cc92",
"shasum": ""
},
"require": {
@@ -1356,7 +1356,7 @@
"json",
"rest"
],
- "time": "2015-09-01 15:26:41"
+ "time": "2015-09-15 08:58:13"
},
{
"name": "dunglas/php-property-info",
@@ -1473,16 +1473,16 @@
},
{
"name": "fortawesome/font-awesome",
- "version": "v4.3.0",
+ "version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/FortAwesome/Font-Awesome.git",
- "reference": "41b9ed01103e6820c3cb043ba7ddab30ecd3f4c0"
+ "reference": "e554555d73a44e0a7d11b0361ad7a5325a5f551c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/41b9ed01103e6820c3cb043ba7ddab30ecd3f4c0",
- "reference": "41b9ed01103e6820c3cb043ba7ddab30ecd3f4c0",
+ "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/e554555d73a44e0a7d11b0361ad7a5325a5f551c",
+ "reference": "e554555d73a44e0a7d11b0361ad7a5325a5f551c",
"shasum": ""
},
"require-dev": {
@@ -1517,7 +1517,7 @@
"font",
"icon"
],
- "time": "2015-01-22 18:09:42"
+ "time": "2015-07-28 21:55:03"
},
{
"name": "friendsofsymfony/rest-bundle",
@@ -1609,12 +1609,12 @@
"source": {
"type": "git",
"url": "https://github.com/FriendsOfSymfony/FOSUserBundle.git",
- "reference": "6b7bb04c6d507bb5356bf70b2d1bc30ce64ffc60"
+ "reference": "d5b28c367d393f9d9fbc48c4138b2a74d51c0c83"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/6b7bb04c6d507bb5356bf70b2d1bc30ce64ffc60",
- "reference": "6b7bb04c6d507bb5356bf70b2d1bc30ce64ffc60",
+ "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/d5b28c367d393f9d9fbc48c4138b2a74d51c0c83",
+ "reference": "d5b28c367d393f9d9fbc48c4138b2a74d51c0c83",
"shasum": ""
},
"require": {
@@ -1668,20 +1668,20 @@
"keywords": [
"User management"
],
- "time": "2015-09-07 08:53:52"
+ "time": "2015-09-15 13:15:07"
},
{
"name": "gedmo/doctrine-extensions",
- "version": "v2.3.12",
+ "version": "v2.4.6",
"source": {
"type": "git",
"url": "https://github.com/Atlantic18/DoctrineExtensions.git",
- "reference": "c3ff3c73c95b01e107af33d4fe3abf80794e2df9"
+ "reference": "5d330411e27ab0ced67e1e5383ccae975c23c17d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Atlantic18/DoctrineExtensions/zipball/c3ff3c73c95b01e107af33d4fe3abf80794e2df9",
- "reference": "c3ff3c73c95b01e107af33d4fe3abf80794e2df9",
+ "url": "https://api.github.com/repos/Atlantic18/DoctrineExtensions/zipball/5d330411e27ab0ced67e1e5383ccae975c23c17d",
+ "reference": "5d330411e27ab0ced67e1e5383ccae975c23c17d",
"shasum": ""
},
"require": {
@@ -1690,11 +1690,12 @@
"php": ">=5.3.2"
},
"require-dev": {
- "doctrine/mongodb-odm": ">=1.0.0-BETA11",
- "doctrine/orm": "~2.4",
+ "doctrine/common": ">=2.5.0",
+ "doctrine/mongodb-odm": "dev-master",
+ "doctrine/orm": ">=2.5.0",
"phpunit/phpunit": "~4.4",
"phpunit/phpunit-mock-objects": "~2.3",
- "symfony/yaml": "~2.3"
+ "symfony/yaml": "~2.6"
},
"suggest": {
"doctrine/mongodb-odm": "to use the extensions with the MongoDB ODM",
@@ -1703,7 +1704,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.3.x-dev"
+ "dev-master": "2.4.x-dev"
}
},
"autoload": {
@@ -1746,7 +1747,7 @@
"tree",
"uploadable"
],
- "time": "2015-02-24 21:41:37"
+ "time": "2015-08-28 11:07:14"
},
{
"name": "imagine/imagine",
@@ -3015,12 +3016,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/DoctrineBridge.git",
- "reference": "2da451d821347f3d33db2e0bd588c2c6f6ad34be"
+ "reference": "e502c5697b139373247d94f8c5cce334f1a181a7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/DoctrineBridge/zipball/2da451d821347f3d33db2e0bd588c2c6f6ad34be",
- "reference": "2da451d821347f3d33db2e0bd588c2c6f6ad34be",
+ "url": "https://api.github.com/repos/symfony/DoctrineBridge/zipball/e502c5697b139373247d94f8c5cce334f1a181a7",
+ "reference": "e502c5697b139373247d94f8c5cce334f1a181a7",
"shasum": ""
},
"require": {
@@ -3076,7 +3077,7 @@
],
"description": "Symfony Doctrine Bridge",
"homepage": "https://symfony.com",
- "time": "2015-09-09 17:42:36"
+ "time": "2015-09-14 14:14:09"
},
{
"name": "symfony/monolog-bundle",
@@ -3370,16 +3371,16 @@
},
{
"name": "twig/twig",
- "version": "v1.21.2",
+ "version": "v1.22.1",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "ddce1136beb8db29b9cd7dffa8ab518b978c9db3"
+ "reference": "b7fc2469fa009897871fb95b68237286fc54a5ad"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/ddce1136beb8db29b9cd7dffa8ab518b978c9db3",
- "reference": "ddce1136beb8db29b9cd7dffa8ab518b978c9db3",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/b7fc2469fa009897871fb95b68237286fc54a5ad",
+ "reference": "b7fc2469fa009897871fb95b68237286fc54a5ad",
"shasum": ""
},
"require": {
@@ -3392,7 +3393,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.21-dev"
+ "dev-master": "1.22-dev"
}
},
"autoload": {
@@ -3427,7 +3428,7 @@
"keywords": [
"templating"
],
- "time": "2015-09-09 05:28:51"
+ "time": "2015-09-15 06:50:16"
},
{
"name": "willdurand/jsonp-callback-validator",
@@ -3946,16 +3947,16 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "2.2.2",
+ "version": "2.2.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "2d7c03c0e4e080901b8f33b2897b0577be18a13c"
+ "reference": "ef1ca6835468857944d5c3b48fa503d5554cff2f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2d7c03c0e4e080901b8f33b2897b0577be18a13c",
- "reference": "2d7c03c0e4e080901b8f33b2897b0577be18a13c",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef1ca6835468857944d5c3b48fa503d5554cff2f",
+ "reference": "ef1ca6835468857944d5c3b48fa503d5554cff2f",
"shasum": ""
},
"require": {
@@ -4004,7 +4005,7 @@
"testing",
"xunit"
],
- "time": "2015-08-04 03:42:39"
+ "time": "2015-09-14 06:51:16"
},
{
"name": "phpunit/php-file-iterator",
@@ -4137,16 +4138,16 @@
},
{
"name": "phpunit/php-token-stream",
- "version": "1.4.6",
+ "version": "1.4.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
- "reference": "3ab72c62e550370a6cd5dc873e1a04ab57562f5b"
+ "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3ab72c62e550370a6cd5dc873e1a04ab57562f5b",
- "reference": "3ab72c62e550370a6cd5dc873e1a04ab57562f5b",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+ "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
"shasum": ""
},
"require": {
@@ -4182,20 +4183,20 @@
"keywords": [
"tokenizer"
],
- "time": "2015-08-16 08:51:00"
+ "time": "2015-09-15 10:49:45"
},
{
"name": "phpunit/phpunit",
- "version": "4.7.7",
+ "version": "4.8.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "9b97f9d807b862c2de2a36e86690000801c85724"
+ "reference": "dab2ada9e9a503d2ec3c32fe0fb59dea9bdd9dfa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9b97f9d807b862c2de2a36e86690000801c85724",
- "reference": "9b97f9d807b862c2de2a36e86690000801c85724",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/dab2ada9e9a503d2ec3c32fe0fb59dea9bdd9dfa",
+ "reference": "dab2ada9e9a503d2ec3c32fe0fb59dea9bdd9dfa",
"shasum": ""
},
"require": {
@@ -4205,7 +4206,7 @@
"ext-reflection": "*",
"ext-spl": "*",
"php": ">=5.3.3",
- "phpspec/prophecy": "~1.3,>=1.3.1",
+ "phpspec/prophecy": "^1.3.1",
"phpunit/php-code-coverage": "~2.1",
"phpunit/php-file-iterator": "~1.4",
"phpunit/php-text-template": "~1.2",
@@ -4213,7 +4214,7 @@
"phpunit/phpunit-mock-objects": "~2.3",
"sebastian/comparator": "~1.1",
"sebastian/diff": "~1.2",
- "sebastian/environment": "~1.2",
+ "sebastian/environment": "~1.3",
"sebastian/exporter": "~1.2",
"sebastian/global-state": "~1.0",
"sebastian/version": "~1.0",
@@ -4228,7 +4229,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.7.x-dev"
+ "dev-master": "4.8.x-dev"
}
},
"autoload": {
@@ -4254,7 +4255,7 @@
"testing",
"xunit"
],
- "time": "2015-07-13 11:28:34"
+ "time": "2015-09-14 06:57:22"
},
{
"name": "phpunit/phpunit-mock-objects",
