aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Citharel <thomas.citharel@framasoft.org>2018-03-19 11:14:24 +0100
committerThomas Citharel <thomas.citharel@framasoft.org>2018-03-19 11:14:24 +0100
commita1fbe3946ad6bbd47a0ef6c77d8e889f5bb807f7 (patch)
tree1a3bff2702bf45f7f5ee1a27925262567bcd9300
parenta97bcf4d6abd831aeb2484398ddfce83ff61bc5a (diff)
parent7a8549cfd71fb4f7a0792538c46aa0a534da2e23 (diff)
downloadframadate-a1fbe3946ad6bbd47a0ef6c77d8e889f5bb807f7.tar
framadate-a1fbe3946ad6bbd47a0ef6c77d8e889f5bb807f7.tar.gz
Merge branch 'update-composer-lock' into 'develop'1.1.0-alpha.1
Update composer.lock See merge request framasoft/framadate!237
-rw-r--r--composer.lock190
1 files changed, 79 insertions, 111 deletions
diff --git a/composer.lock b/composer.lock
index d8ba878..6e33e0f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,22 +4,29 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "90d0e11c397263c819650490edc8d705",
+ "content-hash": "a3ca2dd4f87562095f8c19a94560fed7",
"packages": [
{
"name": "erusev/parsedown",
- "version": "1.6.0",
+ "version": "1.7.1",
"source": {
"type": "git",
"url": "https://github.com/erusev/parsedown.git",
- "reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7"
+ "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/erusev/parsedown/zipball/3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7",
- "reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7",
+ "url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
+ "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
"shasum": ""
},
+ "require": {
+ "ext-mbstring": "*",
+ "php": ">=5.3.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.35"
+ },
"type": "library",
"autoload": {
"psr-0": {
@@ -43,7 +50,7 @@
"markdown",
"parser"
],
- "time": "2015-10-04T16:44:32+00:00"
+ "time": "2018-03-08T01:11:30+00:00"
},
{
"name": "ircmaxell/password-compat",
@@ -216,17 +223,20 @@
"source": {
"type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git",
- "reference": "b5def2d9e0121c82083f552a90f7b499531a20fb"
+ "reference": "1b2f1f59ff8fc933e4d61ee45214ff3228e20c75"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/b5def2d9e0121c82083f552a90f7b499531a20fb",
- "reference": "b5def2d9e0121c82083f552a90f7b499531a20fb",
+ "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/1b2f1f59ff8fc933e4d61ee45214ff3228e20c75",
+ "reference": "1b2f1f59ff8fc933e4d61ee45214ff3228e20c75",
"shasum": ""
},
"conflict": {
+ "3f/pygmentize": "<1.2",
"adodb/adodb-php": "<5.20.6",
"amphp/artax": "<1.0.6|>=2,<2.0.6",
+ "amphp/http": "<1.0.1",
+ "asymmetricrypt/asymmetricrypt": ">=0,<9.9.99",
"aws/aws-sdk-php": ">=3,<3.2.1",
"bugsnag/bugsnag-laravel": ">=2,<2.0.2",
"cakephp/cakephp": ">=1.3,<1.3.18|>=2,<2.4.99|>=2.5,<2.5.99|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3,<3.0.15|>=3.1,<3.1.4",
@@ -249,9 +259,10 @@
"doctrine/mongodb-odm-bundle": ">=2,<3.0.1",
"doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1",
"dompdf/dompdf": ">=0.6,<0.6.2",
- "drupal/core": ">=8,<8.3.7",
- "drupal/drupal": ">=8,<8.3.7",
- "ezsystems/ezpublish-legacy": ">=5.3,<5.3.12.2|>=5.4,<5.4.10.1|>=2017.8,<2017.8.1.1",
+ "drupal/core": ">=8,<8.4.5",
+ "drupal/drupal": ">=8,<8.4.5",
+ "erusev/parsedown": "<1.7",
+ "ezsystems/ezpublish-legacy": ">=5.3,<5.3.12.3|>=5.4,<5.4.11.3|>=2017.8,<2017.8.1.1|>=2017.12,<2017.12.2.1",
"firebase/php-jwt": "<2",
"friendsofsymfony/rest-bundle": ">=1.2,<1.2.2",
"friendsofsymfony/user-bundle": ">=1.2,<1.3.5",
@@ -272,6 +283,8 @@
"oro/crm": ">=1.7,<1.7.4",
"oro/platform": ">=1.7,<1.7.4",
"padraic/humbug_get_contents": "<1.1.2",
+ "pagarme/pagarme-php": ">=0,<3",
+ "paragonie/random_compat": "<2",
"phpmailer/phpmailer": ">=5,<5.2.24",
"phpunit/phpunit": ">=4.8.19,<4.8.28|>=5.0.10,<5.6.3",
"phpxmlrpc/extras": "<0.6.1",
@@ -284,11 +297,12 @@
"silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3",
"silverstripe/framework": ">=3,<3.3",
"silverstripe/userforms": "<3",
- "simplesamlphp/saml2": "<1.10.4|>=2,<2.3.5|>=3,<3.1.1",
+ "simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4",
"simplesamlphp/simplesamlphp": "<1.15.2",
"simplesamlphp/simplesamlphp-module-infocard": "<1.0.1",
"socalnick/scn-social-auth": "<1.15.2",
"squizlabs/php_codesniffer": ">=1,<2.8.1",
+ "stormpath/sdk": ">=0,<9.9.99",
"swiftmailer/swiftmailer": ">=4,<5.4.5",
"symfony/dependency-injection": ">=2,<2.0.17",
"symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13",
@@ -308,7 +322,8 @@
"symfony/web-profiler-bundle": ">=2,<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",
+ "titon/framework": ">=0,<9.9.99",
"twig/twig": "<1.20",
"typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.22|>=8,<8.7.5",
"typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.10|>=3.1,<3.1.7|>=3.2,<3.2.7|>=3.3,<3.3.5",
@@ -357,7 +372,7 @@
}
],
"description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it",
- "time": "2018-02-20T15:56:25+00:00"
+ "time": "2018-03-15T17:53:05+00:00"
},
{
"name": "smarty/smarty",
@@ -654,16 +669,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v2.10.2",
+ "version": "v2.10.4",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
- "reference": "74e4682a4073bc8bc2d4ff2b30a4873ac76cc1f1"
+ "reference": "b2dce1dacff988b79c4aadf252e5dee31bc04e19"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/74e4682a4073bc8bc2d4ff2b30a4873ac76cc1f1",
- "reference": "74e4682a4073bc8bc2d4ff2b30a4873ac76cc1f1",
+ "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/b2dce1dacff988b79c4aadf252e5dee31bc04e19",
+ "reference": "b2dce1dacff988b79c4aadf252e5dee31bc04e19",
"shasum": ""
},
"require": {
@@ -671,7 +686,6 @@
"doctrine/annotations": "^1.2",
"ext-json": "*",
"ext-tokenizer": "*",
- "gecko-packages/gecko-php-unit": "^2.0 || ^3.0",
"php": "^5.6 || >=7.0 <7.3",
"php-cs-fixer/diff": "^1.2",
"symfony/console": "^3.2 || ^4.0",
@@ -688,14 +702,14 @@
"hhvm": "*"
},
"require-dev": {
- "johnkary/phpunit-speedtrap": "^1.1 || ^2.0@dev",
+ "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
"justinrainbow/json-schema": "^5.0",
"keradus/cli-executor": "^1.0",
"mikey179/vfsstream": "^1.6",
"php-coveralls/php-coveralls": "^2.0",
"php-cs-fixer/accessible-object": "^1.0",
"phpunit/phpunit": "^5.7.23 || ^6.4.3",
- "phpunitgoodpractices/traits": "^1.0",
+ "phpunitgoodpractices/traits": "^1.3.1",
"symfony/phpunit-bridge": "^3.2.2 || ^4.0"
},
"suggest": {
@@ -715,6 +729,7 @@
"tests/Test/AbstractIntegrationCaseFactory.php",
"tests/Test/AbstractIntegrationTestCase.php",
"tests/Test/Assert/AssertTokensTrait.php",
+ "tests/Test/Constraint/SameStringsConstraint.php",
"tests/Test/IntegrationCase.php",
"tests/Test/IntegrationCaseFactory.php",
"tests/Test/IntegrationCaseFactoryInterface.php",
@@ -737,54 +752,7 @@
}
],
"description": "A tool to automatically fix PHP code style",
- "time": "2018-02-03T08:30:06+00:00"
- },
- {
- "name": "gecko-packages/gecko-php-unit",
- "version": "v2.2.1",
- "source": {
- "type": "git",
- "url": "https://github.com/GeckoPackages/GeckoPHPUnit.git",
- "reference": "a06beb80f63645140c251cfd757ba94a4a540be5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/GeckoPackages/GeckoPHPUnit/zipball/a06beb80f63645140c251cfd757ba94a4a540be5",
- "reference": "a06beb80f63645140c251cfd757ba94a4a540be5",
- "shasum": ""
- },
- "require": {
- "php": "^5.3.6 || ^7.0"
- },
- "conflict": {
- "phpunit/phpunit": ">=6.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.8.35 || ^5.4.3"
- },
- "suggest": {
- "ext-dom": "When testing with xml.",
- "ext-libxml": "When testing with xml.",
- "phpunit/phpunit": "This is an extension for PHPUnit so make sure you have that in some way."
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "GeckoPackages\\PHPUnit\\": "src/PHPUnit"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "description": "Additional PHPUnit asserts and constraints.",
- "homepage": "https://github.com/GeckoPackages",
- "keywords": [
- "extension",
- "filesystem",
- "phpunit"
- ],
- "time": "2018-02-05T09:26:06+00:00"
+ "time": "2018-03-08T11:13:12+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -2091,16 +2059,16 @@
},
{
"name": "symfony/console",
- "version": "v3.4.4",
+ "version": "v3.4.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "26b6f419edda16c19775211987651cb27baea7f1"
+ "reference": "067339e9b8ec30d5f19f5950208893ff026b94f7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/26b6f419edda16c19775211987651cb27baea7f1",
- "reference": "26b6f419edda16c19775211987651cb27baea7f1",
+ "url": "https://api.github.com/repos/symfony/console/zipball/067339e9b8ec30d5f19f5950208893ff026b94f7",
+ "reference": "067339e9b8ec30d5f19f5950208893ff026b94f7",
"shasum": ""
},
"require": {
@@ -2156,20 +2124,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2018-01-29T09:03:43+00:00"
+ "time": "2018-02-26T15:46:28+00:00"
},
{
"name": "symfony/debug",
- "version": "v3.4.4",
+ "version": "v3.4.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "53f6af2805daf52a43b393b93d2f24925d35c937"
+ "reference": "9b1071f86e79e1999b3d3675d2e0e7684268b9bc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/53f6af2805daf52a43b393b93d2f24925d35c937",
- "reference": "53f6af2805daf52a43b393b93d2f24925d35c937",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/9b1071f86e79e1999b3d3675d2e0e7684268b9bc",
+ "reference": "9b1071f86e79e1999b3d3675d2e0e7684268b9bc",
"shasum": ""
},
"require": {
@@ -2212,20 +2180,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2018-01-18T22:16:57+00:00"
+ "time": "2018-02-28T21:49:22+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v3.4.4",
+ "version": "v3.4.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "26b87b6bca8f8f797331a30b76fdae5342dc26ca"
+ "reference": "58990682ac3fdc1f563b7e705452921372aad11d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/26b87b6bca8f8f797331a30b76fdae5342dc26ca",
- "reference": "26b87b6bca8f8f797331a30b76fdae5342dc26ca",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/58990682ac3fdc1f563b7e705452921372aad11d",
+ "reference": "58990682ac3fdc1f563b7e705452921372aad11d",
"shasum": ""
},
"require": {
@@ -2275,20 +2243,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2018-01-03T07:37:34+00:00"
+ "time": "2018-02-14T10:03:57+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v3.4.4",
+ "version": "v3.4.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "e078773ad6354af38169faf31c21df0f18ace03d"
+ "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/e078773ad6354af38169faf31c21df0f18ace03d",
- "reference": "e078773ad6354af38169faf31c21df0f18ace03d",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/253a4490b528597aa14d2bf5aeded6f5e5e4a541",
+ "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541",
"shasum": ""
},
"require": {
@@ -2324,20 +2292,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2018-01-03T07:37:34+00:00"
+ "time": "2018-02-22T10:48:49+00:00"
},
{
"name": "symfony/finder",
- "version": "v3.4.4",
+ "version": "v3.4.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f"
+ "reference": "a479817ce0a9e4adfd7d39c6407c95d97c254625"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/613e26310776f49a1773b6737c6bd554b8bc8c6f",
- "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/a479817ce0a9e4adfd7d39c6407c95d97c254625",
+ "reference": "a479817ce0a9e4adfd7d39c6407c95d97c254625",
"shasum": ""
},
"require": {
@@ -2373,11 +2341,11 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2018-01-03T07:37:34+00:00"
+ "time": "2018-03-05T18:28:11+00:00"
},
{
"name": "symfony/options-resolver",
- "version": "v3.4.4",
+ "version": "v3.4.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
@@ -2604,16 +2572,16 @@
},
{
"name": "symfony/process",
- "version": "v3.4.4",
+ "version": "v3.4.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "09a5172057be8fc677840e591b17f385e58c7c0d"
+ "reference": "cc4aea21f619116aaf1c58016a944e4821c8e8af"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/09a5172057be8fc677840e591b17f385e58c7c0d",
- "reference": "09a5172057be8fc677840e591b17f385e58c7c0d",
+ "url": "https://api.github.com/repos/symfony/process/zipball/cc4aea21f619116aaf1c58016a944e4821c8e8af",
+ "reference": "cc4aea21f619116aaf1c58016a944e4821c8e8af",
"shasum": ""
},
"require": {
@@ -2649,20 +2617,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2018-01-29T09:03:43+00:00"
+ "time": "2018-02-12T17:55:00+00:00"
},
{
"name": "symfony/stopwatch",
- "version": "v3.4.4",
+ "version": "v3.4.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
- "reference": "c865551df7c17e63fc1f09f763db04387f91ae4d"
+ "reference": "eb17cfa072cab26537ac37e9c4ece6c0361369af"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/stopwatch/zipball/c865551df7c17e63fc1f09f763db04387f91ae4d",
- "reference": "c865551df7c17e63fc1f09f763db04387f91ae4d",
+ "url": "https://api.github.com/repos/symfony/stopwatch/zipball/eb17cfa072cab26537ac37e9c4ece6c0361369af",
+ "reference": "eb17cfa072cab26537ac37e9c4ece6c0361369af",
"shasum": ""
},
"require": {
@@ -2698,20 +2666,20 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
- "time": "2018-01-03T07:37:34+00:00"
+ "time": "2018-02-17T14:55:25+00:00"
},
{
"name": "symfony/yaml",
- "version": "v3.4.4",
+ "version": "v3.4.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "eab73b6c21d27ae4cd037c417618dfd4befb0bfe"
+ "reference": "6af42631dcf89e9c616242c900d6c52bd53bd1bb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/eab73b6c21d27ae4cd037c417618dfd4befb0bfe",
- "reference": "eab73b6c21d27ae4cd037c417618dfd4befb0bfe",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/6af42631dcf89e9c616242c900d6c52bd53bd1bb",
+ "reference": "6af42631dcf89e9c616242c900d6c52bd53bd1bb",
"shasum": ""
},
"require": {
@@ -2756,7 +2724,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2018-01-21T19:05:02+00:00"
+ "time": "2018-02-16T09:50:28+00:00"
},
{
"name": "webmozart/assert",