From 463573bf69e3233655c24a5bde49b214f63115f0 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 13 Sep 2015 14:56:04 +0200 Subject: [PATCH] Update deps --- composer.lock | 107 ++++++++++++++++++++++++++------------------------ 1 file changed, 56 insertions(+), 51 deletions(-) diff --git a/composer.lock b/composer.lock index 7dbb3cd8..d8c55fda 100644 --- a/composer.lock +++ b/composer.lock @@ -1,7 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], "hash": "d457fa385420eb29a177ac38eac977c3", @@ -693,16 +693,16 @@ }, { "name": "doctrine/orm", - "version": "v2.5.0", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/doctrine/doctrine2.git", - "reference": "aa80c7d2c55a372f5f9f825f5c66dbda53a6e3fe" + "reference": "e6a83bedbe67579cb0bfb688e982e617943a2945" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/aa80c7d2c55a372f5f9f825f5c66dbda53a6e3fe", - "reference": "aa80c7d2c55a372f5f9f825f5c66dbda53a6e3fe", + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/e6a83bedbe67579cb0bfb688e982e617943a2945", + "reference": "e6a83bedbe67579cb0bfb688e982e617943a2945", "shasum": "" }, "require": { @@ -766,7 +766,7 @@ "database", "orm" ], - "time": "2015-04-02 20:40:18" + "time": "2015-08-31 12:59:39" }, { "name": "ezyang/htmlpurifier", @@ -948,16 +948,16 @@ "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSUserBundle.git", - "reference": "336d9cd8ba0c5a462b3e70be144a7bef5377b219" + "reference": "6b7bb04c6d507bb5356bf70b2d1bc30ce64ffc60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/336d9cd8ba0c5a462b3e70be144a7bef5377b219", - "reference": "336d9cd8ba0c5a462b3e70be144a7bef5377b219", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/6b7bb04c6d507bb5356bf70b2d1bc30ce64ffc60", + "reference": "6b7bb04c6d507bb5356bf70b2d1bc30ce64ffc60", "shasum": "" }, "require": { - "php": ">=5.3.2", + "php": ">=5.3.9", "symfony/form": "~2.3", "symfony/framework-bundle": "~2.3", "symfony/security-bundle": "~2.3", @@ -1007,7 +1007,7 @@ "keywords": [ "User management" ], - "time": "2015-08-14 09:45:59" + "time": "2015-09-07 08:53:52" }, { "name": "guzzlehttp/guzzle", @@ -1267,23 +1267,23 @@ }, { "name": "j0k3r/graby", - "version": "1.0.0-alpha.0", + "version": "1.0.0-alpha.1", "source": { "type": "git", "url": "https://github.com/j0k3r/graby.git", - "reference": "553a5ddd35e89f37fce2275e1423cc4451c40dbf" + "reference": "9d4f62aa83a7cd563fe3ca9fcc4b176d7e1d264c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/j0k3r/graby/zipball/553a5ddd35e89f37fce2275e1423cc4451c40dbf", - "reference": "553a5ddd35e89f37fce2275e1423cc4451c40dbf", + "url": "https://api.github.com/repos/j0k3r/graby/zipball/9d4f62aa83a7cd563fe3ca9fcc4b176d7e1d264c", + "reference": "9d4f62aa83a7cd563fe3ca9fcc4b176d7e1d264c", "shasum": "" }, "require": { "fin1te/safecurl": "~1.1", "guzzlehttp/guzzle": "^5.2.0", "htmlawed/htmlawed": "^1.1.19", - "j0k3r/graby-site-config": "dev-master", + "j0k3r/graby-site-config": "^1.0.0", "j0k3r/php-readability": "^1.0", "monolog/monolog": "^1.13.1", "neitanod/forceutf8": "^1.4", @@ -1314,20 +1314,20 @@ } ], "description": "Graby helps you extract article content from web pages", - "time": "2015-08-29 10:16:47" + "time": "2015-09-13 10:07:45" }, { "name": "j0k3r/graby-site-config", - "version": "dev-master", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/j0k3r/graby-site-config.git", - "reference": "a5b3add9fcd716c86b8c4220bdbdfbc7e79dd182" + "reference": "9ad65e69bb21397dfededd420e1d4ab22006993c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/a5b3add9fcd716c86b8c4220bdbdfbc7e79dd182", - "reference": "a5b3add9fcd716c86b8c4220bdbdfbc7e79dd182", + "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/9ad65e69bb21397dfededd420e1d4ab22006993c", + "reference": "9ad65e69bb21397dfededd420e1d4ab22006993c", "shasum": "" }, "require": { @@ -1336,7 +1336,7 @@ "type": "library", "autoload": { "psr-4": { - "GrabySiteConfig\\SiteConfig\\": "/" + "GrabySiteConfig\\SiteConfig\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1350,7 +1350,7 @@ } ], "description": "Graby site config files", - "time": "2015-09-10 12:13:05" + "time": "2015-09-13 10:26:25" }, { "name": "j0k3r/php-readability", @@ -2740,32 +2740,37 @@ }, { "name": "symfony/assetic-bundle", - "version": "v2.6.1", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/symfony/AsseticBundle.git", - "reference": "422b0add2110f0cf9bc7a873a386ea053f4a89f0" + "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/422b0add2110f0cf9bc7a873a386ea053f4a89f0", - "reference": "422b0add2110f0cf9bc7a873a386ea053f4a89f0", + "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", + "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", "shasum": "" }, "require": { - "kriswallsmith/assetic": "~1.2", + "kriswallsmith/assetic": "~1.3", "php": ">=5.3.0", "symfony/console": "~2.3", "symfony/dependency-injection": "~2.3", "symfony/framework-bundle": "~2.3", "symfony/yaml": "~2.3" }, + "conflict": { + "kriswallsmith/spork": "<=0.2", + "twig/twig": "<1.20" + }, "require-dev": { - "kriswallsmith/spork": "~0.2", + "kriswallsmith/spork": "~0.3", "patchwork/jsqueeze": "~1.0", "symfony/class-loader": "~2.3", "symfony/css-selector": "~2.3", "symfony/dom-crawler": "~2.3", + "symfony/phpunit-bridge": "~2.7", "symfony/twig-bundle": "~2.3" }, "suggest": { @@ -2775,7 +2780,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.7-dev" } }, "autoload": { @@ -2801,7 +2806,7 @@ "compression", "minification" ], - "time": "2015-01-27 12:45:16" + "time": "2015-09-01 00:05:29" }, { "name": "symfony/monolog-bundle", @@ -2921,23 +2926,23 @@ }, { "name": "symfony/symfony", - "version": "v2.7.3", + "version": "v2.7.4", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "a9af4708b4bb650c4897e9b8dfbfbdb2ea5f0486" + "reference": "1fdf23fe28876844b887b0e1935c9adda43ee645" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/a9af4708b4bb650c4897e9b8dfbfbdb2ea5f0486", - "reference": "a9af4708b4bb650c4897e9b8dfbfbdb2ea5f0486", + "url": "https://api.github.com/repos/symfony/symfony/zipball/1fdf23fe28876844b887b0e1935c9adda43ee645", + "reference": "1fdf23fe28876844b887b0e1935c9adda43ee645", "shasum": "" }, "require": { "doctrine/common": "~2.3", "php": ">=5.3.9", "psr/log": "~1.0", - "twig/twig": "~1.18" + "twig/twig": "~1.20|~2.0" }, "replace": { "symfony/asset": "self.version", @@ -3039,7 +3044,7 @@ "keywords": [ "framework" ], - "time": "2015-07-31 13:24:45" + "time": "2015-09-08 14:26:39" }, { "name": "tecnick.com/tcpdf", @@ -3106,20 +3111,20 @@ }, { "name": "twig/extensions", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig-extensions.git", - "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd" + "reference": "449e3c8a9ffad7c2479c7864557275a32b037499" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/8cf4b9fe04077bd54fc73f4fde83347040c3b8cd", - "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd", + "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/449e3c8a9ffad7c2479c7864557275a32b037499", + "reference": "449e3c8a9ffad7c2479c7864557275a32b037499", "shasum": "" }, "require": { - "twig/twig": "~1.12" + "twig/twig": "~1.20|~2.0" }, "require-dev": { "symfony/translation": "~2.3" @@ -3130,7 +3135,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -3154,7 +3159,7 @@ "i18n", "text" ], - "time": "2014-10-30 14:30:03" + "time": "2015-08-22 16:38:35" }, { "name": "twig/twig", @@ -3323,7 +3328,7 @@ ], "authors": [ { - "name": "William Durand", + "name": "William DURAND", "email": "william.durand1@gmail.com" } ], @@ -3408,7 +3413,7 @@ ], "authors": [ { - "name": "William Durand", + "name": "William DURAND", "email": "william.durand1@gmail.com" } ], @@ -3890,16 +3895,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.8.5", + "version": "4.8.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "9b7417edaf28059ea63d86be941e6004dbfcc0cc" + "reference": "2246830f4a1a551c67933e4171bf2126dc29d357" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9b7417edaf28059ea63d86be941e6004dbfcc0cc", - "reference": "9b7417edaf28059ea63d86be941e6004dbfcc0cc", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2246830f4a1a551c67933e4171bf2126dc29d357", + "reference": "2246830f4a1a551c67933e4171bf2126dc29d357", "shasum": "" }, "require": { @@ -3958,7 +3963,7 @@ "testing", "xunit" ], - "time": "2015-08-19 09:20:57" + "time": "2015-08-24 04:09:38" }, { "name": "phpunit/phpunit-mock-objects", -- 2.41.0