From 8578a94cafa0b7744e38f427b2709ddc41f5d992 Mon Sep 17 00:00:00 2001 From: Lang Date: Sun, 16 Oct 2016 18:27:54 +0200 Subject: [PATCH] composer update --- composer.lock | 114 ++++++++++++++------------ web/config.php | 217 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 272 insertions(+), 59 deletions(-) diff --git a/composer.lock b/composer.lock index 2287047..e1a9ebf 100644 --- a/composer.lock +++ b/composer.lock @@ -961,32 +961,34 @@ "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSUserBundle.git", - "reference": "4cb7a29869e4a9bef4f51986d48b1a3af76d3f48" + "reference": "9c64d6fa7ae264828b2ec98aca847840b200bd56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/4cb7a29869e4a9bef4f51986d48b1a3af76d3f48", - "reference": "4cb7a29869e4a9bef4f51986d48b1a3af76d3f48", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/9c64d6fa7ae264828b2ec98aca847840b200bd56", + "reference": "9c64d6fa7ae264828b2ec98aca847840b200bd56", "shasum": "" }, "require": { - "php": ">=5.3.9", - "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" + "php": "^5.3.9 || ^7.0", + "symfony/form": "^2.7 || ^3.0", + "symfony/framework-bundle": "^2.7 || ^3.0", + "symfony/security-bundle": "^2.7 || ^3.0", + "symfony/twig-bundle": "^2.7 || ^3.0" }, "conflict": { - "symfony/doctrine-bridge": "<2.3" + "symfony/doctrine-bridge": "<2.7" }, "require-dev": { - "doctrine/doctrine-bundle": "~1.3", - "swiftmailer/swiftmailer": "~4.3|~5", - "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" + "doctrine/doctrine-bundle": "^1.3", + "friendsofphp/php-cs-fixer": "^1.11", + "phpunit/phpunit": "~4.8|~5.0", + "swiftmailer/swiftmailer": "^4.3 || ^5.0", + "symfony/console": "^2.7 || ^3.0", + "symfony/phpunit-bridge": "^2.7 || ^3.0", + "symfony/validator": "^2.7 || ^3.0", + "symfony/yaml": "^2.7 || ^3.0", + "willdurand/propel-typehintable-behavior": "^1.0" }, "suggest": { "willdurand/propel-typehintable-behavior": "Needed when using the propel implementation" @@ -1000,7 +1002,10 @@ "autoload": { "psr-4": { "FOS\\UserBundle\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1025,7 +1030,7 @@ "keywords": [ "User management" ], - "time": "2016-09-12 15:04:02" + "time": "2016-10-14 20:44:45" }, { "name": "gos/pnctl-event-loop-emitter", @@ -2018,16 +2023,16 @@ }, { "name": "psr/log", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "5277094ed527a1c4477177d102fe4c53551953e0" + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/5277094ed527a1c4477177d102fe4c53551953e0", - "reference": "5277094ed527a1c4477177d102fe4c53551953e0", + "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", "shasum": "" }, "require": { @@ -2061,7 +2066,7 @@ "psr", "psr-3" ], - "time": "2016-09-19 16:02:08" + "time": "2016-10-10 12:19:37" }, { "name": "react/event-loop", @@ -2194,21 +2199,21 @@ }, { "name": "sensio/distribution-bundle", - "version": "v5.0.12", + "version": "v5.0.13", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "b6dcd04595e4db95ead22ddea58c397864e00c32" + "reference": "7bc47dcfdbde6d567e1a834577d1c04ddb970281" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/b6dcd04595e4db95ead22ddea58c397864e00c32", - "reference": "b6dcd04595e4db95ead22ddea58c397864e00c32", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/7bc47dcfdbde6d567e1a834577d1c04ddb970281", + "reference": "7bc47dcfdbde6d567e1a834577d1c04ddb970281", "shasum": "" }, "require": { "php": ">=5.3.9", - "sensiolabs/security-checker": "~3.0", + "sensiolabs/security-checker": "~3.0|~4.0", "symfony/class-loader": "~2.3|~3.0", "symfony/config": "~2.3|~3.0", "symfony/dependency-injection": "~2.3|~3.0", @@ -2242,7 +2247,7 @@ "configuration", "distribution" ], - "time": "2016-09-14 20:25:12" + "time": "2016-10-08 18:50:33" }, { "name": "sensio/framework-extra-bundle", @@ -2308,20 +2313,20 @@ }, { "name": "sensiolabs/security-checker", - "version": "v3.0.2", + "version": "v4.0.0", "source": { "type": "git", "url": "https://github.com/sensiolabs/security-checker.git", - "reference": "21696b0daa731064c23cfb694c60a2584a7b6e93" + "reference": "116027b57b568ed61b7b1c80eeb4f6ee9e8c599c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/21696b0daa731064c23cfb694c60a2584a7b6e93", - "reference": "21696b0daa731064c23cfb694c60a2584a7b6e93", + "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/116027b57b568ed61b7b1c80eeb4f6ee9e8c599c", + "reference": "116027b57b568ed61b7b1c80eeb4f6ee9e8c599c", "shasum": "" }, "require": { - "symfony/console": "~2.0|~3.0" + "symfony/console": "~2.7|~3.0" }, "bin": [ "security-checker" @@ -2329,7 +2334,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -2348,7 +2353,7 @@ } ], "description": "A security checker for your composer.lock", - "time": "2015-11-07 08:07:40" + "time": "2016-09-23 18:09:57" }, { "name": "swiftmailer/swiftmailer", @@ -2929,16 +2934,16 @@ }, { "name": "symfony/symfony", - "version": "v3.1.4", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "65ca9e4fbdb34f6d463ef77898ca583b101a4162" + "reference": "e7e1d01fe103de78bca6fbf7f6f4acf64482d63c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/65ca9e4fbdb34f6d463ef77898ca583b101a4162", - "reference": "65ca9e4fbdb34f6d463ef77898ca583b101a4162", + "url": "https://api.github.com/repos/symfony/symfony/zipball/e7e1d01fe103de78bca6fbf7f6f4acf64482d63c", + "reference": "e7e1d01fe103de78bca6fbf7f6f4acf64482d63c", "shasum": "" }, "require": { @@ -2951,7 +2956,7 @@ "symfony/polyfill-php56": "~1.0", "symfony/polyfill-php70": "~1.0", "symfony/polyfill-util": "~1.0", - "twig/twig": "~1.23|~2.0" + "twig/twig": "~1.26|~2.0" }, "conflict": { "phpdocumentor/reflection-docblock": "<3.0", @@ -3020,6 +3025,7 @@ "ocramius/proxy-manager": "~0.4|~1.0|~2.0", "phpdocumentor/reflection-docblock": "^3.0", "predis/predis": "~1.0", + "symfony/phpunit-bridge": "~3.2", "symfony/polyfill-apcu": "~1.1", "symfony/security-acl": "~2.8|~3.0" }, @@ -3065,20 +3071,20 @@ "keywords": [ "framework" ], - "time": "2016-09-03 15:28:43" + "time": "2016-10-03 19:01:14" }, { "name": "twig/twig", - "version": "v1.25.0", + "version": "v1.26.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "f16a634ab08d87e520da5671ec52153d627f10f6" + "reference": "a09d8ee17ac1cfea29ed60c83960ad685c6a898d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/f16a634ab08d87e520da5671ec52153d627f10f6", - "reference": "f16a634ab08d87e520da5671ec52153d627f10f6", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/a09d8ee17ac1cfea29ed60c83960ad685c6a898d", + "reference": "a09d8ee17ac1cfea29ed60c83960ad685c6a898d", "shasum": "" }, "require": { @@ -3091,7 +3097,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.25-dev" + "dev-master": "1.26-dev" } }, "autoload": { @@ -3126,7 +3132,7 @@ "keywords": [ "templating" ], - "time": "2016-09-21 23:05:12" + "time": "2016-10-05 18:57:41" }, { "name": "zendframework/zend-code", @@ -3239,16 +3245,16 @@ "packages-dev": [ { "name": "sensio/generator-bundle", - "version": "v3.0.8", + "version": "v3.0.11", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", - "reference": "3c20d16512f37d2be159eca0411b99a141b90fa4" + "reference": "b9be7f1b3b2e8bcfc1debefc901b71da923a5e5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/3c20d16512f37d2be159eca0411b99a141b90fa4", - "reference": "3c20d16512f37d2be159eca0411b99a141b90fa4", + "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/b9be7f1b3b2e8bcfc1debefc901b71da923a5e5c", + "reference": "b9be7f1b3b2e8bcfc1debefc901b71da923a5e5c", "shasum": "" }, "require": { @@ -3287,11 +3293,11 @@ } ], "description": "This bundle generates code for you", - "time": "2016-09-06 01:30:19" + "time": "2016-10-10 14:17:42" }, { "name": "symfony/phpunit-bridge", - "version": "v3.1.4", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", diff --git a/web/config.php b/web/config.php index 1368c8a..a031a3a 100644 --- a/web/config.php +++ b/web/config.php @@ -38,9 +38,216 @@ $hasMinorProblems = (bool) count($minorProblems); Symfony Configuration Checker - - -