From 686d6d3dca66c471e84ef6756515735a1d5baa42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= Date: Fri, 15 Jan 2016 16:07:53 +0100 Subject: [PATCH] Bump webmozart/json, justinrainbow/json-schema and willdurand/negotiation PHRAS-909 --- composer.json | 4 -- composer.lock | 167 +++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 132 insertions(+), 39 deletions(-) diff --git a/composer.json b/composer.json index aa61e5e14c..ec9a076e59 100644 --- a/composer.json +++ b/composer.json @@ -22,10 +22,6 @@ "type": "vcs", "url": "https://github.com/alchemy-fr/JMSTranslationBundle" }, - { - "type": "git", - "url": "https://github.com/alchemy-fr/symfony-cors" - }, { "type": "vcs", "url": "https://github.com/alchemy-fr/embed-bundle.git" diff --git a/composer.lock b/composer.lock index 468ea8fa83..2f53abf1a1 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": "9d34cc6e824ce669456479a581065fb7", - "content-hash": "317a4ac8e941d0fb396ac81e4e3bc41f", + "hash": "208c3c11dd44d08c565efc4e30a9f151", + "content-hash": "936071303af9da18de3b97ba33f1b387", "packages": [ { "name": "alchemy-fr/tcpdf-clone", @@ -533,8 +533,8 @@ "version": "0.1.1", "source": { "type": "git", - "url": "https://github.com/alchemy-fr/symfony-cors", - "reference": "9e7f249e689e66f05a1e3d4d166224aaa1e9cc63" + "url": "https://github.com/alchemy-fr/symfony-cors.git", + "reference": "dbf7fcff1ce9fc1265db12955476ff169eab7375" }, "require": { "symfony/http-kernel": "^2.3.0|^3.0.0" @@ -3179,16 +3179,16 @@ }, { "name": "justinrainbow/json-schema", - "version": "1.5.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "a4bee9f4b344b66e0a0d96c7afae1e92edf385fe" + "reference": "f9e27c3e202faf14fd581ef41355d83bb4b7eb7d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/a4bee9f4b344b66e0a0d96c7afae1e92edf385fe", - "reference": "a4bee9f4b344b66e0a0d96c7afae1e92edf385fe", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/f9e27c3e202faf14fd581ef41355d83bb4b7eb7d", + "reference": "f9e27c3e202faf14fd581ef41355d83bb4b7eb7d", "shasum": "" }, "require": { @@ -3241,7 +3241,7 @@ "json", "schema" ], - "time": "2015-09-08 22:28:04" + "time": "2016-01-06 14:37:04" }, { "name": "league/fractal", @@ -4436,17 +4436,17 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "a6a3d39d1f68e3e04555a2d6b43a9df0977d96d9" + "reference": "9835fc4f8463c944bdc2617cbbdb6b688ca17944" }, "dist": { "type": "zip", "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/9835fc4f8463c944bdc2617cbbdb6b688ca17944", - "reference": "a6a3d39d1f68e3e04555a2d6b43a9df0977d96d9", + "reference": "9835fc4f8463c944bdc2617cbbdb6b688ca17944", "shasum": "" }, "conflict": { "aws/aws-sdk-php": ">=3,<3.2.1", - "cakephp/cakephp": ">=2,<2.4.99|>=1.3,<1.3.18|>=3,<3.0.15|>=2.5,<2.5.90|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3.1,<3.1.3", + "cakephp/cakephp": ">=3,<3.0.15|>=2,<2.4.99|>=2.5,<2.5.90|>=2.6,<2.6.12|>=1.3,<1.3.18|>=2.7,<2.7.6|>=3.1,<3.1.3", "codeigniter/framework": "<3.0.3", "contao/core": ">=2.11,<3|>=3,<3.1|>=3.1,<3.2|>=3.2,<3.2.19|>=3.3,<3.4|>=3.4,<3.4.4", "doctrine/annotations": ">=1,<1.2.7", @@ -4464,6 +4464,7 @@ "friendsofsymfony/user-bundle": ">=1.2,<1.3|>=1.3,<1.3.5", "illuminate/auth": ">=4,<4.0.99|>=4.1,<4.1.26", "illuminate/database": ">=4,<4.0.99|>=4.1,<4.1.29", + "joomla/session": "<1.3.1", "laravel/framework": ">=4,<4.0.99|>=4.1,<4.1.29", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", "monolog/monolog": ">=1.8,<1.12", @@ -4484,7 +4485,7 @@ "symfony/http-foundation": ">=2,<2.1|>=2.1,<2.2|>=2.2,<2.3|>=2.3,<2.3.27|>=2.4,<2.5|>=2.5,<2.5.11|>=2.6,<2.6.6", "symfony/http-kernel": ">=2,<2.1|>=2.1,<2.2|>=2.2,<2.3|>=2.3,<2.3.29|>=2.4,<2.5|>=2.5,<2.5.12|>=2.6,<2.6.8", "symfony/routing": ">=2,<2.0.19", - "symfony/security": ">=2,<2.0.25|>=2.1,<2.1.13|>=2.2,<2.2.9|>=2.3,<2.3.35|>=2.4,<2.5|>=2.5,<2.6|>=2.6,<2.6.12|>=2.7,<2.7.7", + "symfony/security": ">=2.3,<2.3.35|>=2.4,<2.5|>=2.5,<2.6|>=2.6,<2.6.12|>=2.7,<2.7.7|>=2,<2.0.25|>=2.1,<2.1.13|>=2.2,<2.2.9", "symfony/security-http": ">=2.4,<2.5|>=2.5,<2.6|>=2.6,<2.6.12|>=2.7,<2.7.7", "symfony/serializer": ">=2,<2.0.11", "symfony/symfony": ">=2,<2.1|>=2.1,<2.2|>=2.2,<2.3|>=2.3,<2.3.35|>=2.4,<2.5|>=2.5,<2.6|>=2.6,<2.6.12|>=2.7,<2.7.7", @@ -4493,10 +4494,10 @@ "symfony/web-profiler-bundle": ">=2,<2.1|>=2.1,<2.2|>=2.2,<2.3|>=2.3,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4", "symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7", "thelia/backoffice-default-template": ">=2.1,<2.1.2", - "thelia/thelia": ">=2.1,<2.1.2|>=2.1.0-beta1,<2.1.3", + "thelia/thelia": ">=2.1.0-beta1,<2.1.3|>=2.1,<2.1.2", "twig/twig": "<1.20", - "typo3/cms": ">=6.2,<6.2.15|>=7,<7.1|>=7.1,<7.2|>=7.2,<7.3|>=7.3,<7.4", - "typo3/flow": ">=1,<1.0.4|>=2.3,<2.3.7|>=3,<3.0.1|>=1.1,<1.1.1|>=2,<2.0.1", + "typo3/cms": ">=6.2,<6.2.16|>=7,<7.1|>=7.1,<7.2|>=7.2,<7.3|>=7.3,<7.4|>=7.4,<7.5|>=7.5,<7.6|>=7.6,<7.6.1", + "typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.7|>=3,<3.0.1", "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4", "willdurand/js-translation-bundle": "<2.1.1", "yiisoft/yii": ">=1.1.14,<1.1.15", @@ -4541,7 +4542,7 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2015-11-25 04:45:01" + "time": "2016-01-12 07:21:05" }, { "name": "seld/jsonlint", @@ -5430,23 +5431,73 @@ "time": "2013-09-20 10:41:27" }, { - "name": "webmozart/json", - "version": "1.1.0", + "name": "webmozart/assert", + "version": "1.0.2", "source": { "type": "git", - "url": "https://github.com/webmozart/json.git", - "reference": "d44cd8d566f1e2bd2d9b30dc9e4d87d984410058" + "url": "https://github.com/webmozart/assert.git", + "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/json/zipball/d44cd8d566f1e2bd2d9b30dc9e4d87d984410058", - "reference": "d44cd8d566f1e2bd2d9b30dc9e4d87d984410058", + "url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", + "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", "shasum": "" }, "require": { - "justinrainbow/json-schema": ">=1.3.7", - "php": ">=5.3.3", - "seld/jsonlint": "~1.0" + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "^4.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "time": "2015-08-24 13:29:44" + }, + { + "name": "webmozart/json", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/webmozart/json.git", + "reference": "a1fb3da904b8364e3db47eed68f76bfb6cd0031a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozart/json/zipball/a1fb3da904b8364e3db47eed68f76bfb6cd0031a", + "reference": "a1fb3da904b8364e3db47eed68f76bfb6cd0031a", + "shasum": "" + }, + "require": { + "justinrainbow/json-schema": "^1.6", + "php": "^5.3.3|^7.0", + "seld/jsonlint": "^1.0", + "webmozart/path-util": "^2.3" }, "require-dev": { "phpunit/phpunit": "^4.6", @@ -5456,7 +5507,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -5475,20 +5526,66 @@ } ], "description": "A robust JSON decoder/encoder with support for schema validation.", - "time": "2015-12-11 17:37:16" + "time": "2016-01-14 12:11:46" }, { - "name": "willdurand/negotiation", - "version": "v2.0.1", + "name": "webmozart/path-util", + "version": "2.3.0", "source": { "type": "git", - "url": "https://github.com/willdurand/Negotiation.git", - "reference": "a99d19330bfaa050fd09c3b8a10fc8ac258b9a55" + "url": "https://github.com/webmozart/path-util.git", + "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/a99d19330bfaa050fd09c3b8a10fc8ac258b9a55", - "reference": "a99d19330bfaa050fd09c3b8a10fc8ac258b9a55", + "url": "https://api.github.com/repos/webmozart/path-util/zipball/d939f7edc24c9a1bb9c0dee5cb05d8e859490725", + "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "webmozart/assert": "~1.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.6", + "sebastian/version": "^1.0.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\PathUtil\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.", + "time": "2015-12-17 08:42:14" + }, + { + "name": "willdurand/negotiation", + "version": "v2.0.2", + "source": { + "type": "git", + "url": "https://github.com/willdurand/Negotiation.git", + "reference": "a8ce6da7acdf07351ccd6a9359c571ebc0725a21" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/a8ce6da7acdf07351ccd6a9359c571ebc0725a21", + "reference": "a8ce6da7acdf07351ccd6a9359c571ebc0725a21", "shasum": "" }, "require": { @@ -5524,7 +5621,7 @@ "header", "negotiation" ], - "time": "2015-10-02 12:52:52" + "time": "2015-11-21 14:23:02" }, { "name": "zend/gdata",