From 75c3478a0c308c96bccd871f3bc1343356aafb6b Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 10 Sep 2015 15:09:44 +0200 Subject: [PATCH] Update deps --- composer.json | 2 +- composer.lock | 254 +++++++++++++++++++++++++++++++------------------- 2 files changed, 160 insertions(+), 96 deletions(-) diff --git a/composer.json b/composer.json index 6644c2a3a..20bb55371 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,7 @@ "liip/theme-bundle": "~1.1.3", "pagerfanta/pagerfanta": "~1.0.3", "lexik/form-filter-bundle": "~4.0", - "j0k3r/graby": "dev-master" + "j0k3r/graby": "~1.0" }, "require-dev": { "doctrine/doctrine-fixtures-bundle": "~2.2.0", diff --git a/composer.lock b/composer.lock index fd1dd3984..35d8b9786 100644 --- a/composer.lock +++ b/composer.lock @@ -1,23 +1,23 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "5799a00ed8336543f0bfe7320df73ca2", + "hash": "f5520667cebcae76568ff448172854bd", "packages": [ { "name": "doctrine/annotations", - "version": "v1.2.6", + "version": "v1.2.7", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4" + "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/f4a91702ca3cd2e568c3736aa031ed00c3752af4", - "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535", + "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535", "shasum": "" }, "require": { @@ -72,20 +72,20 @@ "docblock", "parser" ], - "time": "2015-06-17 12:21:22" + "time": "2015-08-31 12:32:49" }, { "name": "doctrine/cache", - "version": "v1.4.1", + "version": "v1.4.2", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "c9eadeb743ac6199f7eec423cb9426bc518b7b03" + "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/c9eadeb743ac6199f7eec423cb9426bc518b7b03", - "reference": "c9eadeb743ac6199f7eec423cb9426bc518b7b03", + "url": "https://api.github.com/repos/doctrine/cache/zipball/8c434000f420ade76a07c64cbe08ca47e5c101ca", + "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca", "shasum": "" }, "require": { @@ -142,7 +142,7 @@ "cache", "caching" ], - "time": "2015-04-15 00:11:59" + "time": "2015-08-31 12:36:41" }, { "name": "doctrine/collections", @@ -212,16 +212,16 @@ }, { "name": "doctrine/common", - "version": "v2.5.0", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3" + "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/cd8daf2501e10c63dced7b8b9b905844316ae9d3", - "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3", + "url": "https://api.github.com/repos/doctrine/common/zipball/0009b8f0d4a917aabc971fb089eba80e872f83f9", + "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9", "shasum": "" }, "require": { @@ -281,7 +281,7 @@ "persistence", "spl" ], - "time": "2015-04-02 19:55:44" + "time": "2015-08-31 13:00:22" }, { "name": "doctrine/dbal", @@ -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", @@ -812,6 +812,52 @@ ], "time": "2015-08-05 01:03:42" }, + { + "name": "fin1te/safecurl", + "version": "v1.1", + "source": { + "type": "git", + "url": "https://github.com/fin1te/safecurl.git", + "reference": "98aae75a1f4f8dec2194ce889d418d16c3c877e4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/fin1te/safecurl/zipball/98aae75a1f4f8dec2194ce889d418d16c3c877e4", + "reference": "98aae75a1f4f8dec2194ce889d418d16c3c877e4", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "3.7.*" + }, + "type": "library", + "autoload": { + "psr-0": { + "fin1te\\SafeCurl": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jack W", + "email": "jack@fin1te.net" + } + ], + "description": "A drop-in replacement for 'curl_exec', designed to prevent SSRF attacks.", + "keywords": [ + "curl", + "safe", + "safecurl", + "ssrf", + "websec" + ], + "time": "2014-05-20 12:10:12" + }, { "name": "friendsofsymfony/rest-bundle", "version": "1.7.1", @@ -1154,28 +1200,28 @@ }, { "name": "j0k3r/graby", - "version": "dev-master", + "version": "1.0.0-alpha.0", "source": { "type": "git", "url": "https://github.com/j0k3r/graby.git", - "reference": "ee648fa45efb38b6eb35fdf17606ddac1e414665" + "reference": "553a5ddd35e89f37fce2275e1423cc4451c40dbf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/j0k3r/graby/zipball/ee648fa45efb38b6eb35fdf17606ddac1e414665", - "reference": "ee648fa45efb38b6eb35fdf17606ddac1e414665", + "url": "https://api.github.com/repos/j0k3r/graby/zipball/553a5ddd35e89f37fce2275e1423cc4451c40dbf", + "reference": "553a5ddd35e89f37fce2275e1423cc4451c40dbf", "shasum": "" }, "require": { + "fin1te/safecurl": "~1.1", "guzzlehttp/guzzle": "^5.2.0", "htmlawed/htmlawed": "^1.1.19", - "j0k3r/graby-site-config": "*", + "j0k3r/graby-site-config": "dev-master", "j0k3r/php-readability": "^1.0", "monolog/monolog": "^1.13.1", "neitanod/forceutf8": "^1.4", "php": ">=5.4", "simplepie/simplepie": "^1.3.1", - "symfony/finder": "^2.6.6", "symfony/options-resolver": "^2.6.6" }, "type": "library", @@ -1201,7 +1247,7 @@ } ], "description": "Graby helps you extract article content from web pages", - "time": "2015-08-19 23:05:12" + "time": "2015-08-29 10:16:47" }, { "name": "j0k3r/graby-site-config", @@ -1209,15 +1255,23 @@ "source": { "type": "git", "url": "https://github.com/j0k3r/graby-site-config.git", - "reference": "13b5e27c8e73580e703cdaec9c8ad3a5ade3c547" + "reference": "a5b3add9fcd716c86b8c4220bdbdfbc7e79dd182" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/13b5e27c8e73580e703cdaec9c8ad3a5ade3c547", - "reference": "13b5e27c8e73580e703cdaec9c8ad3a5ade3c547", + "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/a5b3add9fcd716c86b8c4220bdbdfbc7e79dd182", + "reference": "a5b3add9fcd716c86b8c4220bdbdfbc7e79dd182", "shasum": "" }, + "require": { + "symfony/finder": "^2.6.6" + }, "type": "library", + "autoload": { + "psr-4": { + "GrabySiteConfig\\SiteConfig\\": "/" + } + }, "notification-url": "https://packagist.org/downloads/", "license": [ "AGPL-3.0" @@ -1229,20 +1283,20 @@ } ], "description": "Graby site config files", - "time": "2015-08-07 19:10:45" + "time": "2015-09-10 12:13:05" }, { "name": "j0k3r/php-readability", - "version": "v1.0.3", + "version": "v1.0.4", "source": { "type": "git", "url": "https://github.com/j0k3r/php-readability.git", - "reference": "91b80b70e2193fb852d96daf1fe17303876881dc" + "reference": "c5a4a490e155fa20809c9bbcf3e318defbb7a261" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/j0k3r/php-readability/zipball/91b80b70e2193fb852d96daf1fe17303876881dc", - "reference": "91b80b70e2193fb852d96daf1fe17303876881dc", + "url": "https://api.github.com/repos/j0k3r/php-readability/zipball/c5a4a490e155fa20809c9bbcf3e318defbb7a261", + "reference": "c5a4a490e155fa20809c9bbcf3e318defbb7a261", "shasum": "" }, "require": { @@ -1292,7 +1346,7 @@ "extraction", "html" ], - "time": "2015-08-19 21:12:31" + "time": "2015-08-24 09:10:54" }, { "name": "jdorn/sql-formatter", @@ -1573,35 +1627,39 @@ }, { "name": "kriswallsmith/assetic", - "version": "v1.2.1", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "b20efe38845d20458702f97f3ff625d80805897b" + "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/b20efe38845d20458702f97f3ff625d80805897b", - "reference": "b20efe38845d20458702f97f3ff625d80805897b", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/56cb5d6dec9e7a68a4da2fa89844f39d41092f31", + "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31", "shasum": "" }, "require": { "php": ">=5.3.1", "symfony/process": "~2.1" }, + "conflict": { + "twig/twig": "<1.12" + }, "require-dev": { "cssmin/cssmin": "*", "joliclic/javascript-packer": "*", "kamicane/packager": "*", - "leafo/lessphp": "*", - "leafo/scssphp": "*", - "leafo/scssphp-compass": "*", + "leafo/lessphp": "^0.3.7", + "leafo/scssphp": "*@dev", + "leafo/scssphp-compass": "*@dev", "mrclay/minify": "*", - "patchwork/jsqueeze": "~1.0", - "phpunit/phpunit": "~4", + "patchwork/jsqueeze": "~1.0|~2.0", + "phpunit/phpunit": "~4.8", "psr/log": "~1.0", "ptachoire/cssembed": "*", - "twig/twig": "~1.6" + "symfony/phpunit-bridge": "~2.7", + "twig/twig": "~1.8|~2.0" }, "suggest": { "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", @@ -1614,7 +1672,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -1643,7 +1701,7 @@ "compression", "minification" ], - "time": "2014-12-12 05:04:05" + "time": "2015-08-31 19:07:16" }, { "name": "lexik/form-filter-bundle", @@ -1764,12 +1822,12 @@ "version": "1.5", "source": { "type": "git", - "url": "https://github.com/matstars/simplehtmldom.git", + "url": "https://github.com/matgargano/simplehtmldom.git", "reference": "37fb0d7c1bda45c5a4cf14fdef56c1edf6aa42be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matstars/simplehtmldom/zipball/37fb0d7c1bda45c5a4cf14fdef56c1edf6aa42be", + "url": "https://api.github.com/repos/matgargano/simplehtmldom/zipball/37fb0d7c1bda45c5a4cf14fdef56c1edf6aa42be", "reference": "37fb0d7c1bda45c5a4cf14fdef56c1edf6aa42be", "shasum": "" }, @@ -1792,9 +1850,7 @@ "authors": [ { "name": "S.C. Chen", - "email": "me578022@gmail.com", - "homepage": "http://simplehtmldom.sourceforge.net/", - "role": "Lead Developer" + "email": "me578022@gmail.com" } ], "description": "Composer package that gives you access to and (unlike all the others at this time) autoloads S.C. Chen's PHP Simple HTML DOM Parser Library", @@ -1859,16 +1915,16 @@ }, { "name": "monolog/monolog", - "version": "1.16.0", + "version": "1.17.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "c0c0b4bee3aabce7182876b0d912ef2595563db7" + "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c0c0b4bee3aabce7182876b0d912ef2595563db7", - "reference": "c0c0b4bee3aabce7182876b0d912ef2595563db7", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/0524c87587ab85bc4c2d6f5b41253ccb930a5422", + "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422", "shasum": "" }, "require": { @@ -1885,7 +1941,7 @@ "php-console/php-console": "^3.1.3", "phpunit/phpunit": "~4.5", "phpunit/phpunit-mock-objects": "2.3.0", - "raven/raven": "~0.8", + "raven/raven": "~0.11", "ruflin/elastica": ">=0.90 <3.0", "swiftmailer/swiftmailer": "~5.3", "videlalvaro/php-amqplib": "~2.4" @@ -1931,7 +1987,7 @@ "logging", "psr-3" ], - "time": "2015-08-09 17:44:44" + "time": "2015-08-31 09:17:37" }, { "name": "neitanod/forceutf8", @@ -2219,21 +2275,24 @@ }, { "name": "phpoption/phpoption", - "version": "1.4.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "5d099bcf0393908bf4ad69cc47dafb785d51f7f5" + "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/5d099bcf0393908bf4ad69cc47dafb785d51f7f5", - "reference": "5d099bcf0393908bf4ad69cc47dafb785d51f7f5", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed", + "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed", "shasum": "" }, "require": { "php": ">=5.3.0" }, + "require-dev": { + "phpunit/phpunit": "4.7.*" + }, "type": "library", "extra": { "branch-alias": { @@ -2251,10 +2310,8 @@ ], "authors": [ { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com" } ], "description": "Option Type for PHP", @@ -2264,7 +2321,7 @@ "php", "type" ], - "time": "2014-01-09 22:37:17" + "time": "2015-07-25 16:39:46" }, { "name": "psr/log", @@ -2616,32 +2673,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": { @@ -2651,7 +2713,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.7-dev" } }, "autoload": { @@ -2677,7 +2739,7 @@ "compression", "minification" ], - "time": "2015-01-27 12:45:16" + "time": "2015-09-01 00:05:29" }, { "name": "symfony/monolog-bundle", @@ -2797,23 +2859,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", @@ -2915,7 +2977,7 @@ "keywords": [ "framework" ], - "time": "2015-07-31 13:24:45" + "time": "2015-09-08 14:26:39" }, { "name": "tecnick.com/tcpdf", @@ -3034,25 +3096,29 @@ }, { "name": "twig/twig", - "version": "v1.20.0", + "version": "v1.21.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "1ea4e5f81c6d005fe84d0b38e1c4f1955eb86844" + "reference": "ddce1136beb8db29b9cd7dffa8ab518b978c9db3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/1ea4e5f81c6d005fe84d0b38e1c4f1955eb86844", - "reference": "1ea4e5f81c6d005fe84d0b38e1c4f1955eb86844", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/ddce1136beb8db29b9cd7dffa8ab518b978c9db3", + "reference": "ddce1136beb8db29b9cd7dffa8ab518b978c9db3", "shasum": "" }, "require": { "php": ">=5.2.7" }, + "require-dev": { + "symfony/debug": "~2.7", + "symfony/phpunit-bridge": "~2.7" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.20-dev" + "dev-master": "1.21-dev" } }, "autoload": { @@ -3087,7 +3153,7 @@ "keywords": [ "templating" ], - "time": "2015-08-12 15:56:39" + "time": "2015-09-09 05:28:51" }, { "name": "willdurand/hateoas", @@ -3195,7 +3261,7 @@ ], "authors": [ { - "name": "William Durand", + "name": "William DURAND", "email": "william.durand1@gmail.com" } ], @@ -3280,7 +3346,7 @@ ], "authors": [ { - "name": "William Durand", + "name": "William DURAND", "email": "william.durand1@gmail.com" } ], @@ -4310,9 +4376,7 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "j0k3r/graby": 20 - }, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": {