From d4aa17436700713fcb4eb5c4a2c48182f37c3b5e Mon Sep 17 00:00:00 2001 From: Bertrand Dunogier Date: Wed, 23 Dec 2015 16:45:24 +0100 Subject: Updated composer.lock Had to restrict scheb/two-factor-bundle to ~1.4.0 because of a circular service reference. See https://github.com/scheb/two-factor-bundle/issues/33. Also updated php version requirement to 5.5.0. --- .travis.yml | 1 - composer.json | 4 +- composer.lock | 496 ++++++++++++++++++++++++++++++---------------------------- 3 files changed, 262 insertions(+), 239 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a19be61..4542fdcb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,6 @@ cache: - $HOME/.composer/cache php: - - 5.4 - 5.5 - 5.6 - 7.0 diff --git a/composer.json b/composer.json index 26608cdc..29784d5c 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "issues": "https://github.com/wallabag/wallabag/issues" }, "require": { - "php": ">=5.3.3", + "php": ">=5.5.0", "symfony/symfony": "~2.7.0", "doctrine/orm": "~2.3", "doctrine/doctrine-bundle": "1.5.2", @@ -55,7 +55,7 @@ "j0k3r/graby": "~1.0", "friendsofsymfony/user-bundle": "dev-master", "friendsofsymfony/oauth-server-bundle": "^1.4@dev", - "scheb/two-factor-bundle": "~1.4", + "scheb/two-factor-bundle": "~1.4.0", "grandt/phpepub": "~4.0", "wallabag/php-mobi": "~1.0.0", "kphoen/rulerz-bundle": "~0.10" diff --git a/composer.lock b/composer.lock index eea3f8a0..61ab36ee 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "fed9468f6c830b0f81899daad7670af7", - "content-hash": "394f8a6ca5162f2d2756dbbee0ff5aae", + "hash": "cebe2bfc6f67c6f5e16e82f839fbb66b", + "content-hash": "b5d8700f351d76dbd25cf578f53c6df3", "packages": [ { "name": "doctrine/annotations", @@ -77,16 +77,16 @@ }, { "name": "doctrine/cache", - "version": "v1.5.1", + "version": "v1.5.4", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e" + "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/2b9cec5a5e722010cbebc91713d4c11eaa064d5e", - "reference": "2b9cec5a5e722010cbebc91713d4c11eaa064d5e", + "url": "https://api.github.com/repos/doctrine/cache/zipball/47cdc76ceb95cc591d9c79a36dc3794975b5d136", + "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136", "shasum": "" }, "require": { @@ -143,7 +143,7 @@ "cache", "caching" ], - "time": "2015-11-02 18:35:48" + "time": "2015-12-19 05:03:47" }, { "name": "doctrine/collections", @@ -213,16 +213,16 @@ }, { "name": "doctrine/common", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9" + "reference": "311001fd9865a4d0d59efff4eac6d7dcb3f5270c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/0009b8f0d4a917aabc971fb089eba80e872f83f9", - "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9", + "url": "https://api.github.com/repos/doctrine/common/zipball/311001fd9865a4d0d59efff4eac6d7dcb3f5270c", + "reference": "311001fd9865a4d0d59efff4eac6d7dcb3f5270c", "shasum": "" }, "require": { @@ -239,7 +239,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6.x-dev" + "dev-master": "2.5.x-dev" } }, "autoload": { @@ -282,7 +282,7 @@ "persistence", "spl" ], - "time": "2015-08-31 13:00:22" + "time": "2015-12-04 12:49:42" }, { "name": "doctrine/dbal", @@ -435,24 +435,23 @@ }, { "name": "doctrine/doctrine-cache-bundle", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineCacheBundle.git", - "reference": "3233bc78e222d528ca89a6a47d48d6f37888e95e" + "reference": "030ff41ef1db66370b36467086bfb817a661fe6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/3233bc78e222d528ca89a6a47d48d6f37888e95e", - "reference": "3233bc78e222d528ca89a6a47d48d6f37888e95e", + "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/030ff41ef1db66370b36467086bfb817a661fe6a", + "reference": "030ff41ef1db66370b36467086bfb817a661fe6a", "shasum": "" }, "require": { "doctrine/cache": "^1.4.2", "doctrine/inflector": "~1.0", "php": ">=5.3.2", - "symfony/doctrine-bridge": "~2.2|~3.0", - "symfony/security-acl": "~2.3|~3.0" + "symfony/doctrine-bridge": "~2.2|~3.0" }, "require-dev": { "instaclick/coding-standard": "~1.1", @@ -465,13 +464,17 @@ "symfony/finder": "~2.2|~3.0", "symfony/framework-bundle": "~2.2|~3.0", "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/security-acl": "~2.3|~3.0", "symfony/validator": "~2.2|~3.0", "symfony/yaml": "~2.2|~3.0" }, + "suggest": { + "symfony/security-acl": "For using this bundle to cache ACLs" + }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -515,7 +518,7 @@ "cache", "caching" ], - "time": "2015-11-05 13:48:27" + "time": "2015-11-27 04:59:07" }, { "name": "doctrine/inflector", @@ -694,16 +697,16 @@ }, { "name": "doctrine/orm", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/doctrine/doctrine2.git", - "reference": "e6a83bedbe67579cb0bfb688e982e617943a2945" + "reference": "464b5fdbfbbeb4a65465ac173c4c5d90960f41ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/e6a83bedbe67579cb0bfb688e982e617943a2945", - "reference": "e6a83bedbe67579cb0bfb688e982e617943a2945", + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/464b5fdbfbbeb4a65465ac173c4c5d90960f41ff", + "reference": "464b5fdbfbbeb4a65465ac173c4c5d90960f41ff", "shasum": "" }, "require": { @@ -714,12 +717,12 @@ "doctrine/instantiator": "~1.0.1", "ext-pdo": "*", "php": ">=5.4", - "symfony/console": "~2.5" + "symfony/console": "~2.5|~3.0" }, "require-dev": { "phpunit/phpunit": "~4.0", "satooshi/php-coveralls": "dev-master", - "symfony/yaml": "~2.1" + "symfony/yaml": "~2.3|~3.0" }, "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" @@ -767,7 +770,7 @@ "database", "orm" ], - "time": "2015-08-31 12:59:39" + "time": "2015-11-23 12:44:25" }, { "name": "ezyang/htmlpurifier", @@ -938,25 +941,25 @@ }, { "name": "friendsofsymfony/rest-bundle", - "version": "1.7.2", + "version": "1.7.6", "target-dir": "FOS/RestBundle", "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", - "reference": "70db6f7af4bb198881bfc9106aea633fa3e818c0" + "reference": "f95b2f141748e9a5e2ddae833f60c38417aee8c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/70db6f7af4bb198881bfc9106aea633fa3e818c0", - "reference": "70db6f7af4bb198881bfc9106aea633fa3e818c0", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/f95b2f141748e9a5e2ddae833f60c38417aee8c3", + "reference": "f95b2f141748e9a5e2ddae833f60c38417aee8c3", "shasum": "" }, "require": { "doctrine/inflector": "~1.0", - "php": ">=5.3.9", + "php": "^5.3.9|~7.0", "psr/log": "~1.0", - "symfony/framework-bundle": "~2.3", - "symfony/http-kernel": "~2.3,>=2.3.24", + "symfony/framework-bundle": "~2.3|~3.0", + "symfony/http-kernel": "^2.3.24|~3.0", "willdurand/jsonp-callback-validator": "~1.0", "willdurand/negotiation": "~1.2" }, @@ -969,15 +972,16 @@ "jms/serializer": "~0.13|~1.0", "jms/serializer-bundle": "~0.12|~1.0", "phpoption/phpoption": "~1.1.0", - "sensio/framework-extra-bundle": "~3.0", + "sensio/framework-extra-bundle": "~2.0|~3.0", "sllh/php-cs-fixer-styleci-bridge": "^1.3", - "symfony/browser-kit": "~2.3", - "symfony/dependency-injection": "~2.3", - "symfony/form": "~2.3", - "symfony/security": "~2.3", - "symfony/serializer": "~2.3", - "symfony/validator": "~2.3", - "symfony/yaml": "~2.3" + "symfony/browser-kit": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/form": "~2.3|~3.0", + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/security": "~2.3|~3.0", + "symfony/serializer": "~2.3|~3.0", + "symfony/validator": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "suggest": { "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires ~0.12||~1.0", @@ -1014,12 +1018,12 @@ "email": "ever.zet@gmail.com" } ], - "description": "This Bundle provides various tools to rapidly develop RESTful API's with Symfony2", + "description": "This Bundle provides various tools to rapidly develop RESTful API's with Symfony", "homepage": "http://friendsofsymfony.github.com", "keywords": [ "rest" ], - "time": "2015-10-16 07:05:52" + "time": "2015-12-20 13:45:30" }, { "name": "friendsofsymfony/user-bundle", @@ -1027,26 +1031,28 @@ "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSUserBundle.git", - "reference": "45d6f40178216a840885b4ca6d7de9e67068568a" + "reference": "e39b040e272c72f0a090c67d802e1d3b2d0b0313" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/45d6f40178216a840885b4ca6d7de9e67068568a", - "reference": "45d6f40178216a840885b4ca6d7de9e67068568a", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/e39b040e272c72f0a090c67d802e1d3b2d0b0313", + "reference": "e39b040e272c72f0a090c67d802e1d3b2d0b0313", "shasum": "" }, "require": { "php": ">=5.3.9", - "symfony/form": "~2.3", - "symfony/framework-bundle": "~2.3", - "symfony/security-bundle": "~2.3", - "symfony/twig-bundle": "~2.3" + "symfony/form": "~2.3|~3.0", + "symfony/framework-bundle": "~2.3|~3.0", + "symfony/security-bundle": "~2.3|~3.0", + "symfony/twig-bundle": "~2.3|~3.0" }, "require-dev": { "doctrine/doctrine-bundle": "~1.3", "swiftmailer/swiftmailer": "~4.3|~5", - "symfony/validator": "~2.3", - "symfony/yaml": "~2.3", + "symfony/console": "~2.3|~3.0", + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/validator": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0", "willdurand/propel-typehintable-behavior": "~1.0" }, "suggest": { @@ -1086,7 +1092,7 @@ "keywords": [ "User management" ], - "time": "2015-11-03 10:24:23" + "time": "2015-12-05 09:38:57" }, { "name": "grandt/binstring", @@ -2188,30 +2194,31 @@ }, { "name": "j0k3r/graby", - "version": "1.0.4", + "version": "1.0.7", "source": { "type": "git", "url": "https://github.com/j0k3r/graby.git", - "reference": "488cee65ac6ea5dd6bb9734b982159e591de6f0e" + "reference": "301f8c492be4c9b2bed8f29c32641636de0eca0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/j0k3r/graby/zipball/488cee65ac6ea5dd6bb9734b982159e591de6f0e", - "reference": "488cee65ac6ea5dd6bb9734b982159e591de6f0e", + "url": "https://api.github.com/repos/j0k3r/graby/zipball/301f8c492be4c9b2bed8f29c32641636de0eca0a", + "reference": "301f8c492be4c9b2bed8f29c32641636de0eca0a", "shasum": "" }, "require": { + "ext-curl": "*", "guzzlehttp/guzzle": "^5.2.0", "htmlawed/htmlawed": "^1.1.19", "j0k3r/graby-site-config": "^1.0.0", "j0k3r/php-readability": "^1.0", - "j0k3r/safecurl": "1.1.1", + "j0k3r/safecurl": "~2.0", "monolog/monolog": "^1.13.1", - "neitanod/forceutf8": "^1.4", + "neitanod/forceutf8": "^2.0", "php": ">=5.4", "simplepie/simplepie": "^1.3.1", "smalot/pdfparser": "~0.9.24", - "symfony/options-resolver": "^2.6.6" + "symfony/options-resolver": "~2.6|~3.0" }, "type": "library", "autoload": { @@ -2219,7 +2226,6 @@ "Graby\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "AGPL-3.0" ], @@ -2236,24 +2242,27 @@ } ], "description": "Graby helps you extract article content from web pages", - "time": "2015-10-28 06:38:06" + "support": { + "source": "https://github.com/bdunogier/graby/tree/1.0.7" + }, + "time": "2015-12-16 10:21:48" }, { "name": "j0k3r/graby-site-config", - "version": "1.0.6", + "version": "1.0.10", "source": { "type": "git", "url": "https://github.com/j0k3r/graby-site-config.git", - "reference": "6631451c1be563ff3bc8fa16c60ef7df38f8e65b" + "reference": "daea5cdd2c3d89cb90402205392423030f8eebce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/6631451c1be563ff3bc8fa16c60ef7df38f8e65b", - "reference": "6631451c1be563ff3bc8fa16c60ef7df38f8e65b", + "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/daea5cdd2c3d89cb90402205392423030f8eebce", + "reference": "daea5cdd2c3d89cb90402205392423030f8eebce", "shasum": "" }, "require": { - "symfony/finder": "^2.6.6" + "symfony/finder": "~2.6|~3.0" }, "type": "library", "autoload": { @@ -2272,7 +2281,7 @@ } ], "description": "Graby site config files", - "time": "2015-10-24 14:44:25" + "time": "2015-12-16 10:27:19" }, { "name": "j0k3r/php-readability", @@ -2338,25 +2347,29 @@ }, { "name": "j0k3r/safecurl", - "version": "v1.1.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/j0k3r/safecurl.git", - "reference": "3e8594a944ede2b74f3e24e371f2770bbfed6aa5" + "reference": "d5b7a0dcda23f8fd6a3f0ca3dac080e38388ba4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/j0k3r/safecurl/zipball/3e8594a944ede2b74f3e24e371f2770bbfed6aa5", - "reference": "3e8594a944ede2b74f3e24e371f2770bbfed6aa5", + "url": "https://api.github.com/repos/j0k3r/safecurl/zipball/d5b7a0dcda23f8fd6a3f0ca3dac080e38388ba4b", + "reference": "d5b7a0dcda23f8fd6a3f0ca3dac080e38388ba4b", "shasum": "" }, "require": { - "php": ">=5.3.0" + "ext-curl": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "^4.0.0" }, "type": "library", "autoload": { - "psr-0": { - "fin1te\\SafeCurl": "src/" + "psr-4": { + "fin1te\\SafeCurl\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2382,7 +2395,7 @@ "ssrf", "websec" ], - "time": "2015-10-01 18:30:41" + "time": "2015-11-23 08:16:01" }, { "name": "jdorn/sql-formatter", @@ -2663,21 +2676,21 @@ }, { "name": "kphoen/rulerz", - "version": "0.14.0", + "version": "0.16.2", "source": { "type": "git", "url": "https://github.com/K-Phoen/rulerz.git", - "reference": "608649b148ffdf3437600cc0f450d59b0579148d" + "reference": "2b4fd796dadad204353e966b9f53040225ce6871" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/K-Phoen/rulerz/zipball/608649b148ffdf3437600cc0f450d59b0579148d", - "reference": "608649b148ffdf3437600cc0f450d59b0579148d", + "url": "https://api.github.com/repos/K-Phoen/rulerz/zipball/2b4fd796dadad204353e966b9f53040225ce6871", + "reference": "2b4fd796dadad204353e966b9f53040225ce6871", "shasum": "" }, "require": { "hoa/ruler": "~1.0", - "php": ">=5.4", + "php": ">=5.5", "symfony/property-access": "~2.3" }, "require-dev": { @@ -2687,18 +2700,20 @@ "elasticsearch/elasticsearch": "~1.0", "illuminate/database": "~5.0", "mikey179/vfsstream": "~1.4", - "phpspec/phpspec": "~2.0", + "phpspec/phpspec": "~2.0,>=2.4-dev", "pomm-project/cli": "~2.0@dev", "pomm-project/foundation": "~2.0@dev", "pomm-project/model-manager": "~2.0.@dev", "ruflin/elastica": "~1.0", + "solarium/solarium": "~3.0", "vlucas/phpdotenv": "~2.1" }, "suggest": { "doctrine/orm": "To execute rules as Doctrine queries", "elasticsearch/elasticsearch": "To execute rules as Elasticsearch queries", "kphoen/rulerz-spec-builder": "If you want a specification builder", - "pomm-project/model-manager": "To execute rules as Pomm queries" + "pomm-project/model-manager": "To execute rules as Pomm queries", + "solarium/solarium": "To execute rules as Solr queries" }, "type": "library", "extra": { @@ -2727,7 +2742,7 @@ "doctrine", "specification" ], - "time": "2015-10-31 20:54:37" + "time": "2015-12-07 22:24:24" }, { "name": "kphoen/rulerz-bundle", @@ -2781,38 +2796,37 @@ }, { "name": "kriswallsmith/assetic", - "version": "v1.3.1", + "version": "v1.3.2", "source": { "type": "git", "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "cb92b179dddfb8a3f341d53bd27e088f24d9c2e5" + "reference": "9928f7c4ad98b234e3559d1049abd13387f86db5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/cb92b179dddfb8a3f341d53bd27e088f24d9c2e5", - "reference": "cb92b179dddfb8a3f341d53bd27e088f24d9c2e5", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/9928f7c4ad98b234e3559d1049abd13387f86db5", + "reference": "9928f7c4ad98b234e3559d1049abd13387f86db5", "shasum": "" }, "require": { "php": ">=5.3.1", - "symfony/process": "~2.1" + "symfony/process": "~2.1|~3.0" }, "conflict": { - "twig/twig": "<1.12" + "twig/twig": "<1.23" }, "require-dev": { - "cssmin/cssmin": "*", - "joliclic/javascript-packer": "*", - "kamicane/packager": "*", + "cssmin/cssmin": "3.0.1", + "joliclic/javascript-packer": "1.1", + "kamicane/packager": "1.0", "leafo/lessphp": "^0.3.7", - "leafo/scssphp": "*@dev", - "leafo/scssphp-compass": "*@dev", - "mrclay/minify": "*", + "leafo/scssphp": "~0.1", + "mrclay/minify": "~2.2", "patchwork/jsqueeze": "~1.0|~2.0", "phpunit/phpunit": "~4.8", "psr/log": "~1.0", - "ptachoire/cssembed": "*", - "symfony/phpunit-bridge": "~2.7", + "ptachoire/cssembed": "~1.0", + "symfony/phpunit-bridge": "~2.7|~3.0", "twig/twig": "~1.8|~2.0" }, "suggest": { @@ -2855,7 +2869,7 @@ "compression", "minification" ], - "time": "2015-10-15 01:33:42" + "time": "2015-11-12 13:51:40" }, { "name": "lexik/form-filter-bundle", @@ -3018,16 +3032,16 @@ }, { "name": "michelf/php-markdown", - "version": "1.5.0", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/michelf/php-markdown.git", - "reference": "e1aabe18173231ebcefc90e615565742fc1c7fd9" + "reference": "155287e4222d2dd69b6a21221617b50668d5892e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/michelf/php-markdown/zipball/e1aabe18173231ebcefc90e615565742fc1c7fd9", - "reference": "e1aabe18173231ebcefc90e615565742fc1c7fd9", + "url": "https://api.github.com/repos/michelf/php-markdown/zipball/155287e4222d2dd69b6a21221617b50668d5892e", + "reference": "155287e4222d2dd69b6a21221617b50668d5892e", "shasum": "" }, "require": { @@ -3049,15 +3063,15 @@ "BSD-3-Clause" ], "authors": [ - { - "name": "John Gruber", - "homepage": "http://daringfireball.net/" - }, { "name": "Michel Fortin", "email": "michel.fortin@michelf.ca", "homepage": "https://michelf.ca/", "role": "Developer" + }, + { + "name": "John Gruber", + "homepage": "https://daringfireball.net/" } ], "description": "PHP Markdown", @@ -3065,7 +3079,7 @@ "keywords": [ "markdown" ], - "time": "2015-03-01 12:03:08" + "time": "2015-12-22 18:18:12" }, { "name": "monolog/monolog", @@ -3146,16 +3160,16 @@ }, { "name": "neitanod/forceutf8", - "version": "v1.5", + "version": "v2.0", "source": { "type": "git", "url": "https://github.com/neitanod/forceutf8.git", - "reference": "1b577b9430cb7bd20d8dd7435f36120b85880ace" + "reference": "2c1b21e00ed16b2b083ae4e27901cb5f2856db90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/neitanod/forceutf8/zipball/1b577b9430cb7bd20d8dd7435f36120b85880ace", - "reference": "1b577b9430cb7bd20d8dd7435f36120b85880ace", + "url": "https://api.github.com/repos/neitanod/forceutf8/zipball/2c1b21e00ed16b2b083ae4e27901cb5f2856db90", + "reference": "2c1b21e00ed16b2b083ae4e27901cb5f2856db90", "shasum": "" }, "require": { @@ -3176,29 +3190,29 @@ ], "description": "PHP Class Encoding featuring popular Encoding::toUTF8() function --formerly known as forceUTF8()-- that fixes mixed encoded strings.", "homepage": "https://github.com/neitanod/forceutf8", - "time": "2015-01-02 13:36:36" + "time": "2015-05-07 16:37:23" }, { "name": "nelmio/api-doc-bundle", - "version": "2.10.3", + "version": "2.11.1", "target-dir": "Nelmio/ApiDocBundle", "source": { "type": "git", "url": "https://github.com/nelmio/NelmioApiDocBundle.git", - "reference": "be90e8aad60b7701097b900c4a3a971a50f9862e" + "reference": "19d4e37365edd5104e31662a2d3b510d92a7e78a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/be90e8aad60b7701097b900c4a3a971a50f9862e", - "reference": "be90e8aad60b7701097b900c4a3a971a50f9862e", + "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/19d4e37365edd5104e31662a2d3b510d92a7e78a", + "reference": "19d4e37365edd5104e31662a2d3b510d92a7e78a", "shasum": "" }, "require": { "michelf/php-markdown": "~1.4", "php": ">=5.3", - "symfony/console": "~2.3", - "symfony/framework-bundle": "~2.3", - "symfony/twig-bundle": "~2.3" + "symfony/console": "~2.3|~3.0", + "symfony/framework-bundle": "~2.3|~3.0", + "symfony/twig-bundle": "~2.3|~3.0" }, "conflict": { "jms/serializer": "<0.12", @@ -3206,18 +3220,20 @@ "twig/twig": "<1.12" }, "require-dev": { - "dunglas/api-bundle": "~1.0", - "friendsofsymfony/rest-bundle": "~1.0", + "doctrine/doctrine-bundle": "~1.5", + "doctrine/orm": "~2.3", + "dunglas/api-bundle": "~1.0@dev", + "friendsofsymfony/rest-bundle": "~1.0|~2.0", "jms/serializer-bundle": ">=0.11", "sensio/framework-extra-bundle": "~3.0", - "symfony/browser-kit": "~2.3", - "symfony/css-selector": "~2.3", - "symfony/finder": "~2.3", - "symfony/form": "~2.3", - "symfony/phpunit-bridge": "~2.7", - "symfony/serializer": "~2.7", - "symfony/validator": "~2.3", - "symfony/yaml": "~2.3" + "symfony/browser-kit": "~2.3|~3.0", + "symfony/css-selector": "~2.3|~3.0", + "symfony/finder": "~2.3|~3.0", + "symfony/form": "~2.3|~3.0", + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/serializer": "~2.7|~3.0", + "symfony/validator": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "suggest": { "dunglas/api-bundle": "For making use of resources definitions of DunglasApiBundle.", @@ -3229,7 +3245,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.10.x-dev" + "dev-master": "2.11-dev" } }, "autoload": { @@ -3258,40 +3274,42 @@ "documentation", "rest" ], - "time": "2015-10-28 09:30:40" + "time": "2015-12-08 13:19:42" }, { "name": "nelmio/cors-bundle", - "version": "1.4.0", - "target-dir": "Nelmio/CorsBundle", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/nelmio/NelmioCorsBundle.git", - "reference": "553b4c5cdb3ff155f910e8f6e3e0806d42c763a6" + "reference": "fa14a81737c605bf4766054cdcb72a16a433d537" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nelmio/NelmioCorsBundle/zipball/553b4c5cdb3ff155f910e8f6e3e0806d42c763a6", - "reference": "553b4c5cdb3ff155f910e8f6e3e0806d42c763a6", + "url": "https://api.github.com/repos/nelmio/NelmioCorsBundle/zipball/fa14a81737c605bf4766054cdcb72a16a433d537", + "reference": "fa14a81737c605bf4766054cdcb72a16a433d537", "shasum": "" }, "require": { - "symfony/framework-bundle": "~2.2" + "symfony/framework-bundle": "^2.2 || ^3.0" }, "require-dev": { - "matthiasnoback/symfony-dependency-injection-test": "0.2.*", - "mockery/mockery": "dev-master" + "matthiasnoback/symfony-dependency-injection-test": "^0.7.6", + "mockery/mockery": "0.9.*" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "1.4.x-dev" } }, "autoload": { - "psr-0": { - "Nelmio\\CorsBundle": "" - } + "psr-4": { + "Nelmio\\CorsBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3313,7 +3331,7 @@ "cors", "crossdomain" ], - "time": "2015-01-13 17:53:27" + "time": "2015-12-09 17:26:34" }, { "name": "pagerfanta/pagerfanta", @@ -3484,22 +3502,22 @@ }, { "name": "phpzip/phpzip", - "version": "2.0.7", + "version": "2.0.8", "source": { "type": "git", "url": "https://github.com/Grandt/PHPZip.git", - "reference": "a43a7ce8b2f21050f8b143876c5c1661b0d65306" + "reference": "936f93d656f68e29c231a39e19fd59a636fe7e47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Grandt/PHPZip/zipball/a43a7ce8b2f21050f8b143876c5c1661b0d65306", - "reference": "a43a7ce8b2f21050f8b143876c5c1661b0d65306", + "url": "https://api.github.com/repos/Grandt/PHPZip/zipball/936f93d656f68e29c231a39e19fd59a636fe7e47", + "reference": "936f93d656f68e29c231a39e19fd59a636fe7e47", "shasum": "" }, "require": { - "grandt/binstring": ">=0.2.0", - "grandt/phpzipmerge": ">=1.0.3", - "grandt/relativepath": ">=1.0.1", + "grandt/binstring": ">=1.0.0", + "grandt/phpzipmerge": ">=1.0.4", + "grandt/relativepath": ">=1.0.2", "php": ">=5.3.0" }, "type": "library", @@ -3541,7 +3559,7 @@ "stream", "zip" ], - "time": "2015-04-30 06:45:53" + "time": "2015-11-16 16:30:51" }, { "name": "psr/log", @@ -3676,17 +3694,17 @@ }, { "name": "sensio/distribution-bundle", - "version": "v3.0.33", + "version": "v3.0.34", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "63245e12c948bf50278383e70fd5d6841af17e17" + "reference": "587f3cd08bf8856cfc888b255f34f18b85930657" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/63245e12c948bf50278383e70fd5d6841af17e17", - "reference": "63245e12c948bf50278383e70fd5d6841af17e17", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/587f3cd08bf8856cfc888b255f34f18b85930657", + "reference": "587f3cd08bf8856cfc888b255f34f18b85930657", "shasum": "" }, "require": { @@ -3732,20 +3750,20 @@ "configuration", "distribution" ], - "time": "2015-10-27 18:46:42" + "time": "2015-11-26 18:10:17" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.11", + "version": "v3.0.12", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "a79e205737b58d557c05caef6dfa8f94d8084bca" + "reference": "3e8936fe13aa4086644977d334d8fcd275f50357" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/a79e205737b58d557c05caef6dfa8f94d8084bca", - "reference": "a79e205737b58d557c05caef6dfa8f94d8084bca", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/3e8936fe13aa4086644977d334d8fcd275f50357", + "reference": "3e8936fe13aa4086644977d334d8fcd275f50357", "shasum": "" }, "require": { @@ -3787,7 +3805,7 @@ "annotations", "controllers" ], - "time": "2015-10-28 15:47:04" + "time": "2015-12-18 17:39:27" }, { "name": "sensiolabs/security-checker", @@ -4035,25 +4053,25 @@ }, { "name": "symfony/assetic-bundle", - "version": "v2.7.0", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/symfony/assetic-bundle.git", - "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5" + "reference": "d885ec8451d5a7b077bda81bb19ac9fbff9cdc76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", - "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", + "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/d885ec8451d5a7b077bda81bb19ac9fbff9cdc76", + "reference": "d885ec8451d5a7b077bda81bb19ac9fbff9cdc76", "shasum": "" }, "require": { "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" + "symfony/console": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/framework-bundle": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "conflict": { "kriswallsmith/spork": "<=0.2", @@ -4062,11 +4080,11 @@ "require-dev": { "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" + "symfony/class-loader": "~2.3|~3.0", + "symfony/css-selector": "~2.3|~3.0", + "symfony/dom-crawler": "~2.3|~3.0", + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/twig-bundle": "~2.3|~3.0" }, "suggest": { "kriswallsmith/spork": "to be able to dump assets in parallel", @@ -4101,33 +4119,33 @@ "compression", "minification" ], - "time": "2015-09-01 00:05:29" + "time": "2015-11-17 09:45:47" }, { "name": "symfony/monolog-bundle", - "version": "2.8.1", + "version": "v2.8.2", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a" + "reference": "84785c4d44801c4dd82829fa2e1820cacfe2c46f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/7117b9a145722e3c5768db4585f6ad0643ed5c4a", - "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/84785c4d44801c4dd82829fa2e1820cacfe2c46f", + "reference": "84785c4d44801c4dd82829fa2e1820cacfe2c46f", "shasum": "" }, "require": { "monolog/monolog": "~1.8", "php": ">=5.3.2", - "symfony/config": "~2.3|3.*", - "symfony/dependency-injection": "~2.3|3.*", - "symfony/http-kernel": "~2.3|3.*", - "symfony/monolog-bridge": "~2.3|3.*" + "symfony/config": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/http-kernel": "~2.3|~3.0", + "symfony/monolog-bridge": "~2.3|~3.0" }, "require-dev": { - "symfony/console": "~2.3|3.*", - "symfony/yaml": "~2.3" + "symfony/console": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "type": "symfony-bundle", "extra": { @@ -4160,32 +4178,32 @@ "log", "logging" ], - "time": "2015-10-02 11:51:59" + "time": "2015-11-17 10:02:29" }, { "name": "symfony/swiftmailer-bundle", - "version": "v2.3.8", + "version": "v2.3.9", "source": { "type": "git", "url": "https://github.com/symfony/swiftmailer-bundle.git", - "reference": "970b13d01871207e81d17b17ddda025e7e21e797" + "reference": "3d21ada19f23631f558ad6df653b168e35362e78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/970b13d01871207e81d17b17ddda025e7e21e797", - "reference": "970b13d01871207e81d17b17ddda025e7e21e797", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/3d21ada19f23631f558ad6df653b168e35362e78", + "reference": "3d21ada19f23631f558ad6df653b168e35362e78", "shasum": "" }, "require": { "php": ">=5.3.2", "swiftmailer/swiftmailer": ">=4.2.0,~5.0", - "symfony/swiftmailer-bridge": "~2.1" + "symfony/config": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/http-kernel": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "require-dev": { - "symfony/config": "~2.1", - "symfony/dependency-injection": "~2.1", - "symfony/http-kernel": "~2.1", - "symfony/yaml": "~2.1" + "symfony/phpunit-bridge": "~2.7|~3.0" }, "suggest": { "psr/log": "Allows logging" @@ -4217,27 +4235,27 @@ ], "description": "Symfony SwiftmailerBundle", "homepage": "http://symfony.com", - "time": "2014-12-01 17:44:50" + "time": "2015-11-28 10:59:29" }, { "name": "symfony/symfony", - "version": "v2.7.6", + "version": "v2.7.7", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "66b2e9662c44d478b69e48278aa54079a006eb42" + "reference": "cc69dbd24b4b2e6de60b2414ef95da2794f459a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/66b2e9662c44d478b69e48278aa54079a006eb42", - "reference": "66b2e9662c44d478b69e48278aa54079a006eb42", + "url": "https://api.github.com/repos/symfony/symfony/zipball/cc69dbd24b4b2e6de60b2414ef95da2794f459a2", + "reference": "cc69dbd24b4b2e6de60b2414ef95da2794f459a2", "shasum": "" }, "require": { "doctrine/common": "~2.4", "php": ">=5.3.9", "psr/log": "~1.0", - "twig/twig": "~1.20|~2.0" + "twig/twig": "~1.23|~2.0" }, "replace": { "symfony/asset": "self.version", @@ -4317,6 +4335,9 @@ ], "files": [ "src/Symfony/Component/Intl/Resources/stubs/functions.php" + ], + "exclude-from-classmap": [ + "**/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -4338,7 +4359,7 @@ "keywords": [ "framework" ], - "time": "2015-10-27 19:07:24" + "time": "2015-11-23 11:58:08" }, { "name": "tecnickcom/tcpdf", @@ -5238,16 +5259,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.8.18", + "version": "4.8.21", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "fa33d4ad96481b91df343d83e8c8aabed6b1dfd3" + "reference": "ea76b17bced0500a28098626b84eda12dbcf119c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fa33d4ad96481b91df343d83e8c8aabed6b1dfd3", - "reference": "fa33d4ad96481b91df343d83e8c8aabed6b1dfd3", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ea76b17bced0500a28098626b84eda12dbcf119c", + "reference": "ea76b17bced0500a28098626b84eda12dbcf119c", "shasum": "" }, "require": { @@ -5306,7 +5327,7 @@ "testing", "xunit" ], - "time": "2015-11-11 11:32:49" + "time": "2015-12-12 07:45:58" }, { "name": "phpunit/phpunit-mock-objects", @@ -5430,28 +5451,28 @@ }, { "name": "sebastian/diff", - "version": "1.3.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3" + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3", - "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "~4.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -5474,24 +5495,24 @@ } ], "description": "Diff implementation", - "homepage": "http://www.github.com/sebastianbergmann/diff", + "homepage": "https://github.com/sebastianbergmann/diff", "keywords": [ "diff" ], - "time": "2015-02-22 15:13:53" + "time": "2015-12-08 07:14:41" }, { "name": "sebastian/environment", - "version": "1.3.2", + "version": "1.3.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44" + "reference": "6e7133793a8e5a5714a551a8324337374be209df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6324c907ce7a52478eeeaede764f48733ef5ae44", - "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e7133793a8e5a5714a551a8324337374be209df", + "reference": "6e7133793a8e5a5714a551a8324337374be209df", "shasum": "" }, "require": { @@ -5528,7 +5549,7 @@ "environment", "hhvm" ], - "time": "2015-08-03 06:14:51" + "time": "2015-12-02 08:37:27" }, { "name": "sebastian/exporter", @@ -5649,16 +5670,16 @@ }, { "name": "sebastian/recursion-context", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "994d4a811bafe801fb06dccbee797863ba2792ba" + "reference": "913401df809e99e4f47b27cdd781f4a258d58791" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/994d4a811bafe801fb06dccbee797863ba2792ba", - "reference": "994d4a811bafe801fb06dccbee797863ba2792ba", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791", + "reference": "913401df809e99e4f47b27cdd781f4a258d58791", "shasum": "" }, "require": { @@ -5698,7 +5719,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2015-06-21 08:04:50" + "time": "2015-11-11 19:50:13" }, { "name": "sebastian/version", @@ -5785,20 +5806,20 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v2.7.6", + "version": "v2.7.7", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "896bbd1742a6ecd2f7904167bdb6bf88eb6cfbe4" + "reference": "e960e64acbed50e49818eb78840486c8d7fe1bed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/896bbd1742a6ecd2f7904167bdb6bf88eb6cfbe4", - "reference": "896bbd1742a6ecd2f7904167bdb6bf88eb6cfbe4", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/e960e64acbed50e49818eb78840486c8d7fe1bed", + "reference": "e960e64acbed50e49818eb78840486c8d7fe1bed", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.9" }, "suggest": { "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" @@ -5815,7 +5836,10 @@ ], "psr-4": { "Symfony\\Bridge\\PhpUnit\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5833,7 +5857,7 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2015-09-27 10:08:51" + "time": "2015-11-06 10:15:01" } ], "aliases": [], -- cgit v1.2.3