diff --git a/composer.json b/composer.json index 25d126edc..dc83c8302 100644 --- a/composer.json +++ b/composer.json @@ -17,19 +17,21 @@ "miljar/php-exif": "^0.6.4", "nesbot/carbon": "^1.34", "sensio/framework-extra-bundle": "^5.1", - "sensiolabs/security-checker": "^4.1", + "sensiolabs/security-checker": "dev-master", "stof/doctrine-extensions-bundle": "^1.3", - "symfony/asset": "^4.1", - "symfony/console": "^4.1", + "symfony/asset": "4.2.x-dev", + "symfony/console": "4.2.x-dev", "symfony/debug-pack": "^1.0", "symfony/flex": "^1.1", - "symfony/form": "^4.1", - "symfony/framework-bundle": "^4.1", + "symfony/form": "4.2.x-dev", + "symfony/framework-bundle": "4.2.x-dev", "symfony/orm-pack": "^1.0", "symfony/polyfill-php72": "^1.8", + "symfony/security-bundle": "4.2.x-dev", + "symfony/serializer": "4.2.x-dev", "symfony/swiftmailer-bundle": "^3.1", - "symfony/translation": "^4.1", - "symfony/yaml": "^4.1", + "symfony/translation": "4.2.x-dev", + "symfony/yaml": "4.2.x-dev", "tightenco/collect": "^5.7", "twig/extensions": "^1.5", "webmozart/path-util": "^2.3", @@ -39,17 +41,17 @@ "dama/doctrine-test-bundle": "^5.0", "doctrine/doctrine-fixtures-bundle": "^3.0", "friendsofphp/php-cs-fixer": "^2.12", - "symfony/browser-kit": "^4.1", - "symfony/css-selector": "^4.1", - "symfony/debug-bundle": "^4.1", - "symfony/dotenv": "^4.1", + "symfony/browser-kit": "4.2.x-dev", + "symfony/css-selector": "4.2.x-dev", + "symfony/debug-bundle": "4.2.x-dev", + "symfony/dotenv": "4.2.x-dev", "symfony/maker-bundle": "^1.7", - "symfony/phpunit-bridge": "^4.1", - "symfony/stopwatch": "^4.1", - "symfony/web-profiler-bundle": "^4.1", - "symfony/web-server-bundle": "^4.1" + "symfony/phpunit-bridge": "4.2.x-dev", + "symfony/stopwatch": "4.2.x-dev", + "symfony/web-profiler-bundle": "4.2.x-dev", + "symfony/web-server-bundle": "4.2.x-dev" }, - "minimum-stability": "beta", + "minimum-stability": "dev", "prefer-stable": true, "config": { "platform": { @@ -88,8 +90,7 @@ }, "extra": { "symfony": { - "allow-contrib": true, - "require": "4.1.*" + "allow-contrib": true } } } diff --git a/composer.lock b/composer.lock index ca3c27a17..0d95fa6bc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d8630df80556926a86f8594fe1710971", + "content-hash": "e4b1bf44667a1f259a22ae4f7ed56b80", "packages": [ { "name": "api-platform/api-pack", @@ -3314,20 +3314,21 @@ }, { "name": "sensiolabs/security-checker", - "version": "v4.1.8", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/sensiolabs/security-checker.git", - "reference": "dc270d5fec418cc6ac983671dba5d80ffaffb142" + "reference": "61a5c92f382e5b57e72d3e02d8cb2c158886df81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/dc270d5fec418cc6ac983671dba5d80ffaffb142", - "reference": "dc270d5fec418cc6ac983671dba5d80ffaffb142", + "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/61a5c92f382e5b57e72d3e02d8cb2c158886df81", + "reference": "61a5c92f382e5b57e72d3e02d8cb2c158886df81", "shasum": "" }, "require": { "composer/ca-bundle": "^1.0", + "php": ">=5.5.9", "symfony/console": "~2.7|~3.0|~4.0" }, "bin": [ @@ -3336,12 +3337,12 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "5.0-dev" } }, "autoload": { - "psr-0": { - "SensioLabs\\Security": "" + "psr-4": { + "SensioLabs\\Security\\": "SensioLabs/Security" } }, "notification-url": "https://packagist.org/downloads/", @@ -3355,7 +3356,7 @@ } ], "description": "A security checker for your composer.lock", - "time": "2018-02-28T22:10:01+00:00" + "time": "2018-10-06T12:35:11+00:00" }, { "name": "stof/doctrine-extensions-bundle", @@ -3483,16 +3484,16 @@ }, { "name": "symfony/asset", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/asset.git", - "reference": "7bec13dad0df8146ee6ba9350203fcc832814bfe" + "reference": "1c95b86a1fdc16f546115e01823b11aa7b8e1706" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/asset/zipball/7bec13dad0df8146ee6ba9350203fcc832814bfe", - "reference": "7bec13dad0df8146ee6ba9350203fcc832814bfe", + "url": "https://api.github.com/repos/symfony/asset/zipball/1c95b86a1fdc16f546115e01823b11aa7b8e1706", + "reference": "1c95b86a1fdc16f546115e01823b11aa7b8e1706", "shasum": "" }, "require": { @@ -3508,7 +3509,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -3535,7 +3536,7 @@ ], "description": "Symfony Asset Component", "homepage": "https://symfony.com", - "time": "2018-07-26T09:10:45+00:00" + "time": "2018-08-29T15:58:00+00:00" }, { "name": "symfony/cache", @@ -3608,16 +3609,16 @@ }, { "name": "symfony/config", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "b3d4d7b567d7a49e6dfafb6d4760abc921177c96" + "reference": "1dcdcb9f6c743eda02e53f1c3d0f6a0ead4e6fc2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/b3d4d7b567d7a49e6dfafb6d4760abc921177c96", - "reference": "b3d4d7b567d7a49e6dfafb6d4760abc921177c96", + "url": "https://api.github.com/repos/symfony/config/zipball/1dcdcb9f6c743eda02e53f1c3d0f6a0ead4e6fc2", + "reference": "1dcdcb9f6c743eda02e53f1c3d0f6a0ead4e6fc2", "shasum": "" }, "require": { @@ -3640,7 +3641,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -3667,24 +3668,25 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2018-09-08T13:24:10+00:00" + "time": "2018-09-24T07:37:12+00:00" }, { "name": "symfony/console", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "dc7122fe5f6113cfaba3b3de575d31112c9aa60b" + "reference": "e0c9878432059f2c1cce8ebddb0f41271a9ee1ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/dc7122fe5f6113cfaba3b3de575d31112c9aa60b", - "reference": "dc7122fe5f6113cfaba3b3de575d31112c9aa60b", + "url": "https://api.github.com/repos/symfony/console/zipball/e0c9878432059f2c1cce8ebddb0f41271a9ee1ff", + "reference": "e0c9878432059f2c1cce8ebddb0f41271a9ee1ff", "shasum": "" }, "require": { "php": "^7.1.3", + "symfony/contracts": "^1.0", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { @@ -3708,7 +3710,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -3735,7 +3737,75 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-10-03T08:15:46+00:00" + "time": "2018-10-03T08:52:36+00:00" + }, + { + "name": "symfony/contracts", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/symfony/contracts.git", + "reference": "7e5e15779910215bb39b4288c479fb62eb42e894" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/contracts/zipball/7e5e15779910215bb39b4288c479fb62eb42e894", + "reference": "7e5e15779910215bb39b4288c479fb62eb42e894", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "require-dev": { + "psr/cache": "^1.0", + "psr/container": "^1.0" + }, + "suggest": { + "psr/cache": "When using the Cache contracts", + "psr/container": "When using the Service contracts", + "symfony/cache-contracts-implementation": "", + "symfony/service-contracts-implementation": "", + "symfony/translation-contracts-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\": "" + }, + "exclude-from-classmap": [ + "**/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A set of abstractions extracted out of the Symfony components", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2018-10-06T16:22:22+00:00" }, { "name": "symfony/debug", @@ -3795,16 +3865,16 @@ }, { "name": "symfony/debug-bundle", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/debug-bundle.git", - "reference": "018e0f393ef6d073e2bf445dfcf9aad310698a51" + "reference": "ff481d19a9cfd2a86bef82490b331fbd585db283" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/018e0f393ef6d073e2bf445dfcf9aad310698a51", - "reference": "018e0f393ef6d073e2bf445dfcf9aad310698a51", + "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/ff481d19a9cfd2a86bef82490b331fbd585db283", + "reference": "ff481d19a9cfd2a86bef82490b331fbd585db283", "shasum": "" }, "require": { @@ -3815,10 +3885,11 @@ "symfony/var-dumper": "^4.1.1" }, "conflict": { + "symfony/config": "<4.2", "symfony/dependency-injection": "<3.4" }, "require-dev": { - "symfony/config": "~3.4|~4.0", + "symfony/config": "~4.2", "symfony/dependency-injection": "~3.4|~4.0", "symfony/web-profiler-bundle": "~3.4|~4.0" }, @@ -3829,7 +3900,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -3856,7 +3927,7 @@ ], "description": "Symfony DebugBundle", "homepage": "https://symfony.com", - "time": "2018-06-23T12:23:56+00:00" + "time": "2018-06-25T17:06:32+00:00" }, { "name": "symfony/debug-pack", @@ -3890,33 +3961,35 @@ }, { "name": "symfony/dependency-injection", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "f6b9d893ad28aefd8942dc0469c8397e2216fe30" + "reference": "88f240c4a5a1abb399b5c7dfefe1d7ac0a088587" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f6b9d893ad28aefd8942dc0469c8397e2216fe30", - "reference": "f6b9d893ad28aefd8942dc0469c8397e2216fe30", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/88f240c4a5a1abb399b5c7dfefe1d7ac0a088587", + "reference": "88f240c4a5a1abb399b5c7dfefe1d7ac0a088587", "shasum": "" }, "require": { "php": "^7.1.3", - "psr/container": "^1.0" + "psr/container": "^1.0", + "symfony/contracts": "^1.0" }, "conflict": { - "symfony/config": "<4.1.1", + "symfony/config": "<4.2", "symfony/finder": "<3.4", "symfony/proxy-manager-bridge": "<3.4", "symfony/yaml": "<3.4" }, "provide": { - "psr/container-implementation": "1.0" + "psr/container-implementation": "1.0", + "symfony/service-contracts-implementation": "1.0" }, "require-dev": { - "symfony/config": "~4.1", + "symfony/config": "~4.2", "symfony/expression-language": "~3.4|~4.0", "symfony/yaml": "~3.4|~4.0" }, @@ -3930,7 +4003,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -3957,7 +4030,7 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2018-10-02T12:40:59+00:00" + "time": "2018-10-03T07:27:24+00:00" }, { "name": "symfony/doctrine-bridge", @@ -4300,23 +4373,23 @@ }, { "name": "symfony/form", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/form.git", - "reference": "360f22cdb0278d69fbd571b293df04065b2a2279" + "reference": "40ad68252518a225f2344cf2d15c8924dda874ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/form/zipball/360f22cdb0278d69fbd571b293df04065b2a2279", - "reference": "360f22cdb0278d69fbd571b293df04065b2a2279", + "url": "https://api.github.com/repos/symfony/form/zipball/40ad68252518a225f2344cf2d15c8924dda874ec", + "reference": "40ad68252518a225f2344cf2d15c8924dda874ec", "shasum": "" }, "require": { "php": "^7.1.3", "symfony/event-dispatcher": "~3.4|~4.0", "symfony/intl": "~3.4|~4.0", - "symfony/options-resolver": "~3.4|~4.0", + "symfony/options-resolver": "~4.2", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0", "symfony/property-access": "~3.4|~4.0" @@ -4327,6 +4400,7 @@ "symfony/doctrine-bridge": "<3.4", "symfony/framework-bundle": "<3.4", "symfony/http-kernel": "<3.4", + "symfony/translation": "<4.2", "symfony/twig-bridge": "<3.4.5|<4.0.5,>=4.0" }, "require-dev": { @@ -4337,7 +4411,7 @@ "symfony/http-foundation": "~3.4|~4.0", "symfony/http-kernel": "~3.4|~4.0", "symfony/security-csrf": "~3.4|~4.0", - "symfony/translation": "~3.4|~4.0", + "symfony/translation": "~4.2", "symfony/validator": "~3.4|~4.0", "symfony/var-dumper": "~3.4|~4.0" }, @@ -4350,7 +4424,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -4377,33 +4451,33 @@ ], "description": "Symfony Form Component", "homepage": "https://symfony.com", - "time": "2018-10-02T12:40:59+00:00" + "time": "2018-10-06T16:22:22+00:00" }, { "name": "symfony/framework-bundle", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "3a0f2ec035c6ecc0f751fda1a76b02310bc9bbfe" + "reference": "1743926045c60d361298b11eb27deb11faaf3891" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/3a0f2ec035c6ecc0f751fda1a76b02310bc9bbfe", - "reference": "3a0f2ec035c6ecc0f751fda1a76b02310bc9bbfe", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/1743926045c60d361298b11eb27deb11faaf3891", + "reference": "1743926045c60d361298b11eb27deb11faaf3891", "shasum": "" }, "require": { "ext-xml": "*", "php": "^7.1.3", "symfony/cache": "~3.4|~4.0", - "symfony/config": "~3.4|~4.0", - "symfony/dependency-injection": "^4.1.1", + "symfony/config": "~4.2", + "symfony/dependency-injection": "^4.2", "symfony/event-dispatcher": "^4.1", "symfony/filesystem": "~3.4|~4.0", "symfony/finder": "~3.4|~4.0", - "symfony/http-foundation": "^4.1", - "symfony/http-kernel": "^4.1", + "symfony/http-foundation": "^4.1.2", + "symfony/http-kernel": "^4.2", "symfony/polyfill-mbstring": "~1.0", "symfony/routing": "^4.1" }, @@ -4414,11 +4488,11 @@ "symfony/asset": "<3.4", "symfony/console": "<3.4", "symfony/form": "<4.1", - "symfony/messenger": ">=4.2", + "symfony/messenger": "<4.2", "symfony/property-info": "<3.4", "symfony/serializer": "<4.1", "symfony/stopwatch": "<3.4", - "symfony/translation": "<3.4", + "symfony/translation": "<4.2", "symfony/twig-bridge": "<4.1.1", "symfony/validator": "<4.1", "symfony/workflow": "<4.1" @@ -4436,17 +4510,17 @@ "symfony/expression-language": "~3.4|~4.0", "symfony/form": "^4.1", "symfony/lock": "~3.4|~4.0", - "symfony/messenger": "^4.1", + "symfony/messenger": "^4.2", "symfony/polyfill-intl-icu": "~1.0", "symfony/process": "~3.4|~4.0", "symfony/property-info": "~3.4|~4.0", "symfony/security": "~3.4|~4.0", "symfony/security-core": "~3.4|~4.0", "symfony/security-csrf": "~3.4|~4.0", - "symfony/serializer": "^4.1", + "symfony/serializer": "^4.2", "symfony/stopwatch": "~3.4|~4.0", "symfony/templating": "~3.4|~4.0", - "symfony/translation": "~3.4|~4.0", + "symfony/translation": "~4.2", "symfony/validator": "^4.1", "symfony/var-dumper": "~3.4|~4.0", "symfony/web-link": "~3.4|~4.0", @@ -4456,6 +4530,7 @@ }, "suggest": { "ext-apcu": "For best performance of the system caches", + "phpdocumentor/reflection-docblock": "For display additional information in debug:container", "symfony/console": "For using the console commands", "symfony/form": "For using forms", "symfony/property-info": "For using the property_info service", @@ -4467,7 +4542,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -4494,7 +4569,7 @@ ], "description": "Symfony FrameworkBundle", "homepage": "https://symfony.com", - "time": "2018-10-03T08:47:56+00:00" + "time": "2018-10-06T16:33:05+00:00" }, { "name": "symfony/http-foundation", @@ -4552,21 +4627,22 @@ }, { "name": "symfony/http-kernel", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "f5e7c15a5d010be0e16ce798594c5960451d4220" + "reference": "ad7d47d5c1b5c2d25f80905fd3f4cd4cc2e1cadc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f5e7c15a5d010be0e16ce798594c5960451d4220", - "reference": "f5e7c15a5d010be0e16ce798594c5960451d4220", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ad7d47d5c1b5c2d25f80905fd3f4cd4cc2e1cadc", + "reference": "ad7d47d5c1b5c2d25f80905fd3f4cd4cc2e1cadc", "shasum": "" }, "require": { "php": "^7.1.3", "psr/log": "~1.0", + "symfony/contracts": "^1.0", "symfony/debug": "~3.4|~4.0", "symfony/event-dispatcher": "~4.1", "symfony/http-foundation": "^4.1.1", @@ -4574,7 +4650,8 @@ }, "conflict": { "symfony/config": "<3.4", - "symfony/dependency-injection": "<4.1", + "symfony/dependency-injection": "<4.2", + "symfony/translation": "<4.2", "symfony/var-dumper": "<4.1.1", "twig/twig": "<1.34|<2.4,>=2" }, @@ -4587,7 +4664,7 @@ "symfony/config": "~3.4|~4.0", "symfony/console": "~3.4|~4.0", "symfony/css-selector": "~3.4|~4.0", - "symfony/dependency-injection": "^4.1", + "symfony/dependency-injection": "^4.2", "symfony/dom-crawler": "~3.4|~4.0", "symfony/expression-language": "~3.4|~4.0", "symfony/finder": "~3.4|~4.0", @@ -4595,7 +4672,7 @@ "symfony/routing": "~3.4|~4.0", "symfony/stopwatch": "~3.4|~4.0", "symfony/templating": "~3.4|~4.0", - "symfony/translation": "~3.4|~4.0", + "symfony/translation": "~4.2", "symfony/var-dumper": "^4.1.1" }, "suggest": { @@ -4608,7 +4685,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -4635,7 +4712,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2018-10-03T12:53:38+00:00" + "time": "2018-10-06T16:22:22+00:00" }, { "name": "symfony/inflector", @@ -4902,16 +4979,16 @@ }, { "name": "symfony/options-resolver", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "40f0e40d37c1c8a762334618dea597d64bbb75ff" + "reference": "353fde224412a47a8da55a7a2344760cc206d511" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/40f0e40d37c1c8a762334618dea597d64bbb75ff", - "reference": "40f0e40d37c1c8a762334618dea597d64bbb75ff", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/353fde224412a47a8da55a7a2344760cc206d511", + "reference": "353fde224412a47a8da55a7a2344760cc206d511", "shasum": "" }, "require": { @@ -4920,7 +4997,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -4952,7 +5029,7 @@ "configuration", "options" ], - "time": "2018-09-18T12:45:12+00:00" + "time": "2018-09-18T16:38:25+00:00" }, { "name": "symfony/orm-pack", @@ -5461,59 +5538,134 @@ "time": "2018-10-02T12:40:59+00:00" }, { - "name": "symfony/security", - "version": "v4.1.6", + "name": "symfony/security-bundle", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/symfony/security.git", - "reference": "5393c2d277bf53fb3d91f083b067f8ce41033fcd" + "url": "https://github.com/symfony/security-bundle.git", + "reference": "b7a7f3ee5d9f68ee773b62fe1fbef2995b12078c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security/zipball/5393c2d277bf53fb3d91f083b067f8ce41033fcd", - "reference": "5393c2d277bf53fb3d91f083b067f8ce41033fcd", + "url": "https://api.github.com/repos/symfony/security-bundle/zipball/b7a7f3ee5d9f68ee773b62fe1fbef2995b12078c", + "reference": "b7a7f3ee5d9f68ee773b62fe1fbef2995b12078c", "shasum": "" }, "require": { + "ext-xml": "*", "php": "^7.1.3", + "symfony/config": "^4.2", + "symfony/dependency-injection": "^4.2", + "symfony/http-kernel": "^4.1", + "symfony/security-core": "~4.2", + "symfony/security-csrf": "~4.2", + "symfony/security-guard": "~4.2", + "symfony/security-http": "~4.2" + }, + "conflict": { + "symfony/browser-kit": "<4.2", + "symfony/console": "<3.4", + "symfony/event-dispatcher": "<3.4", + "symfony/framework-bundle": "<4.2", + "symfony/var-dumper": "<3.4" + }, + "require-dev": { + "doctrine/doctrine-bundle": "~1.5", + "symfony/asset": "~3.4|~4.0", + "symfony/browser-kit": "~4.2", + "symfony/console": "~3.4|~4.0", + "symfony/css-selector": "~3.4|~4.0", + "symfony/dom-crawler": "~3.4|~4.0", "symfony/event-dispatcher": "~3.4|~4.0", + "symfony/expression-language": "~3.4|~4.0", + "symfony/form": "~3.4|~4.0", + "symfony/framework-bundle": "~4.2", "symfony/http-foundation": "~3.4|~4.0", - "symfony/http-kernel": "~3.4|~4.0", - "symfony/property-access": "~3.4|~4.0" + "symfony/process": "~3.4|~4.0", + "symfony/translation": "~3.4|~4.0", + "symfony/twig-bridge": "~3.4|~4.0", + "symfony/twig-bundle": "~3.4|~4.0", + "symfony/validator": "~3.4|~4.0", + "symfony/var-dumper": "~3.4|~4.0", + "symfony/yaml": "~3.4|~4.0", + "twig/twig": "~1.34|~2.4" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "4.2-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Bundle\\SecurityBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony SecurityBundle", + "homepage": "https://symfony.com", + "time": "2018-10-03T07:02:12+00:00" + }, + { + "name": "symfony/security-core", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/symfony/security-core.git", + "reference": "438de433a5241246c30e0af9a7588a9bbfa34c9f" }, - "replace": { - "symfony/security-core": "self.version", - "symfony/security-csrf": "self.version", - "symfony/security-guard": "self.version", - "symfony/security-http": "self.version" + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/security-core/zipball/438de433a5241246c30e0af9a7588a9bbfa34c9f", + "reference": "438de433a5241246c30e0af9a7588a9bbfa34c9f", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/contracts": "^1.0" }, "require-dev": { "psr/container": "^1.0", "psr/log": "~1.0", + "symfony/event-dispatcher": "~3.4|~4.0", "symfony/expression-language": "~3.4|~4.0", - "symfony/finder": "~3.4|~4.0", + "symfony/http-foundation": "~3.4|~4.0", "symfony/ldap": "~3.4|~4.0", - "symfony/polyfill-intl-icu": "~1.0", - "symfony/routing": "~3.4|~4.0", "symfony/validator": "~3.4|~4.0" }, "suggest": { "psr/container-implementation": "To instantiate the Security class", + "symfony/event-dispatcher": "", "symfony/expression-language": "For using the expression voter", - "symfony/form": "", - "symfony/ldap": "For using the LDAP user and authentication providers", - "symfony/routing": "For using the HttpUtils class to create sub-requests, redirect the user, and match URLs", + "symfony/http-foundation": "", + "symfony/ldap": "For using LDAP integration", "symfony/validator": "For using the user password constraint" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { "psr-4": { - "Symfony\\Component\\Security\\": "" + "Symfony\\Component\\Security\\Core\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -5533,67 +5685,166 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Security Component", + "description": "Symfony Security Component - Core Library", "homepage": "https://symfony.com", - "time": "2018-10-02T12:40:59+00:00" + "time": "2018-10-03T07:02:12+00:00" }, { - "name": "symfony/security-bundle", - "version": "v4.1.6", + "name": "symfony/security-csrf", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/symfony/security-bundle.git", - "reference": "be4456eb61bb142342a7c9a41e4127783b077a86" + "url": "https://github.com/symfony/security-csrf.git", + "reference": "422cfc18e8ce9dea315cfd595a61c31804f8f0cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-bundle/zipball/be4456eb61bb142342a7c9a41e4127783b077a86", - "reference": "be4456eb61bb142342a7c9a41e4127783b077a86", + "url": "https://api.github.com/repos/symfony/security-csrf/zipball/422cfc18e8ce9dea315cfd595a61c31804f8f0cf", + "reference": "422cfc18e8ce9dea315cfd595a61c31804f8f0cf", "shasum": "" }, "require": { - "ext-xml": "*", "php": "^7.1.3", - "symfony/dependency-injection": "^3.4.3|^4.0.3", - "symfony/http-kernel": "^4.1", - "symfony/security": "^4.1.4" + "symfony/security-core": "~3.4|~4.0" }, "conflict": { - "symfony/console": "<3.4", - "symfony/event-dispatcher": "<3.4", - "symfony/framework-bundle": "<4.1.1", - "symfony/var-dumper": "<3.4" + "symfony/http-foundation": "<3.4" }, "require-dev": { - "doctrine/doctrine-bundle": "~1.5", - "symfony/asset": "~3.4|~4.0", - "symfony/browser-kit": "~3.4|~4.0", - "symfony/console": "~3.4|~4.0", - "symfony/css-selector": "~3.4|~4.0", - "symfony/dom-crawler": "~3.4|~4.0", + "symfony/http-foundation": "~3.4|~4.0" + }, + "suggest": { + "symfony/http-foundation": "For using the class SessionTokenStorage." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.2-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Security\\Csrf\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Security Component - CSRF Library", + "homepage": "https://symfony.com", + "time": "2018-10-02T12:43:31+00:00" + }, + { + "name": "symfony/security-guard", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/symfony/security-guard.git", + "reference": "0f2d85eb00f541e0c69bad032b925c77545a5a29" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/security-guard/zipball/0f2d85eb00f541e0c69bad032b925c77545a5a29", + "reference": "0f2d85eb00f541e0c69bad032b925c77545a5a29", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/security-core": "~3.4|~4.0", + "symfony/security-http": "~3.4|~4.0" + }, + "require-dev": { + "psr/log": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.2-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Security\\Guard\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Security Component - Guard", + "homepage": "https://symfony.com", + "time": "2018-10-02T12:43:31+00:00" + }, + { + "name": "symfony/security-http", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/symfony/security-http.git", + "reference": "7b3e687483df4ae1b8a693338126272f04fc79ce" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/security-http/zipball/7b3e687483df4ae1b8a693338126272f04fc79ce", + "reference": "7b3e687483df4ae1b8a693338126272f04fc79ce", + "shasum": "" + }, + "require": { + "php": "^7.1.3", "symfony/event-dispatcher": "~3.4|~4.0", - "symfony/expression-language": "~3.4|~4.0", - "symfony/form": "~3.4|~4.0", - "symfony/framework-bundle": "~4.1", "symfony/http-foundation": "~3.4|~4.0", - "symfony/process": "~3.4|~4.0", - "symfony/translation": "~3.4|~4.0", - "symfony/twig-bridge": "~3.4|~4.0", - "symfony/twig-bundle": "~3.4|~4.0", - "symfony/validator": "~3.4|~4.0", - "symfony/var-dumper": "~3.4|~4.0", - "symfony/yaml": "~3.4|~4.0", - "twig/twig": "~1.34|~2.4" + "symfony/http-kernel": "~3.4|~4.0", + "symfony/property-access": "~3.4|~4.0", + "symfony/security-core": "~3.4|~4.0" }, - "type": "symfony-bundle", + "conflict": { + "symfony/security-csrf": "<3.4.11|~4.0,<4.0.11" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/routing": "~3.4|~4.0", + "symfony/security-csrf": "^3.4.11|^4.0.11" + }, + "suggest": { + "symfony/routing": "For using the HttpUtils class to create sub-requests, redirect the user, and match URLs", + "symfony/security-csrf": "For using tokens to protect authentication/logout attempts" + }, + "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { "psr-4": { - "Symfony\\Bundle\\SecurityBundle\\": "" + "Symfony\\Component\\Security\\Http\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -5613,22 +5864,22 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony SecurityBundle", + "description": "Symfony Security Component - HTTP Integration", "homepage": "https://symfony.com", - "time": "2018-10-02T12:40:59+00:00" + "time": "2018-10-03T07:02:12+00:00" }, { "name": "symfony/serializer", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "2704442b2b85429b95659fdce1696cb8f009385f" + "reference": "540ad2e2f614c185f6d4254c9474c5783e72b42d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/2704442b2b85429b95659fdce1696cb8f009385f", - "reference": "2704442b2b85429b95659fdce1696cb8f009385f", + "url": "https://api.github.com/repos/symfony/serializer/zipball/540ad2e2f614c185f6d4254c9474c5783e72b42d", + "reference": "540ad2e2f614c185f6d4254c9474c5783e72b42d", "shasum": "" }, "require": { @@ -5668,7 +5919,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -5695,29 +5946,30 @@ ], "description": "Symfony Serializer Component", "homepage": "https://symfony.com", - "time": "2018-10-02T12:40:59+00:00" + "time": "2018-10-05T07:43:51+00:00" }, { "name": "symfony/stopwatch", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "5bfc064125b73ff81229e19381ce1c34d3416f4b" + "reference": "187946b203e26517babe4dcbc2c045dec8579376" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5bfc064125b73ff81229e19381ce1c34d3416f4b", - "reference": "5bfc064125b73ff81229e19381ce1c34d3416f4b", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/187946b203e26517babe4dcbc2c045dec8579376", + "reference": "187946b203e26517babe4dcbc2c045dec8579376", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": "^7.1.3", + "symfony/contracts": "^1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -5744,7 +5996,7 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2018-10-02T12:40:59+00:00" + "time": "2018-10-02T12:43:31+00:00" }, { "name": "symfony/swiftmailer-bundle", @@ -5810,20 +6062,21 @@ }, { "name": "symfony/translation", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "9f0b61e339160a466ebcde167a6c5521c810e304" + "reference": "805ed11f0712f714433772a0f505626842af0beb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/9f0b61e339160a466ebcde167a6c5521c810e304", - "reference": "9f0b61e339160a466ebcde167a6c5521c810e304", + "url": "https://api.github.com/repos/symfony/translation/zipball/805ed11f0712f714433772a0f505626842af0beb", + "reference": "805ed11f0712f714433772a0f505626842af0beb", "shasum": "" }, "require": { "php": "^7.1.3", + "symfony/contracts": "^1.0", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { @@ -5831,6 +6084,9 @@ "symfony/dependency-injection": "<3.4", "symfony/yaml": "<3.4" }, + "provide": { + "symfony/translation-contracts-implementation": "1.0" + }, "require-dev": { "psr/log": "~1.0", "symfony/config": "~3.4|~4.0", @@ -5848,7 +6104,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -5875,7 +6131,7 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-10-02T16:36:10+00:00" + "time": "2018-10-06T16:22:22+00:00" }, { "name": "symfony/twig-bridge", @@ -5969,21 +6225,21 @@ }, { "name": "symfony/twig-bundle", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/twig-bundle.git", - "reference": "efc59fa344a2b7985afae56877a6cf59de9954e2" + "reference": "12cb48441868cda3bcedaf10e31a189d4aa6d325" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/efc59fa344a2b7985afae56877a6cf59de9954e2", - "reference": "efc59fa344a2b7985afae56877a6cf59de9954e2", + "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/12cb48441868cda3bcedaf10e31a189d4aa6d325", + "reference": "12cb48441868cda3bcedaf10e31a189d4aa6d325", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/config": "~3.4|~4.0", + "symfony/config": "~4.2", "symfony/http-foundation": "~4.1", "symfony/http-kernel": "~4.1", "symfony/polyfill-ctype": "~1.8", @@ -5992,7 +6248,8 @@ }, "conflict": { "symfony/dependency-injection": "<4.1", - "symfony/framework-bundle": "<4.1" + "symfony/framework-bundle": "<4.1", + "symfony/translation": "<4.2" }, "require-dev": { "doctrine/annotations": "~1.0", @@ -6012,7 +6269,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -6039,7 +6296,7 @@ ], "description": "Symfony TwigBundle", "homepage": "https://symfony.com", - "time": "2018-09-30T03:38:13+00:00" + "time": "2018-09-30T03:40:00+00:00" }, { "name": "symfony/validator", @@ -6204,34 +6461,33 @@ }, { "name": "symfony/web-profiler-bundle", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/web-profiler-bundle.git", - "reference": "17fed79cdbc4649ea59297e6ca7aa8e89182c3c1" + "reference": "d86066c8bda6f7f81acc56f4fdf8d4c74ba78133" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/17fed79cdbc4649ea59297e6ca7aa8e89182c3c1", - "reference": "17fed79cdbc4649ea59297e6ca7aa8e89182c3c1", + "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/d86066c8bda6f7f81acc56f4fdf8d4c74ba78133", + "reference": "d86066c8bda6f7f81acc56f4fdf8d4c74ba78133", "shasum": "" }, "require": { "php": "^7.1.3", + "symfony/config": "^4.2", "symfony/http-kernel": "~4.1", "symfony/routing": "~3.4|~4.0", - "symfony/twig-bridge": "~3.4|~4.0", + "symfony/twig-bundle": "~4.2", "symfony/var-dumper": "~3.4|~4.0", "twig/twig": "~1.34|~2.4" }, "conflict": { - "symfony/config": "<3.4", "symfony/dependency-injection": "<3.4", "symfony/event-dispatcher": "<3.4", "symfony/var-dumper": "<3.4" }, "require-dev": { - "symfony/config": "~3.4|~4.0", "symfony/console": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0", "symfony/stopwatch": "~3.4|~4.0" @@ -6239,7 +6495,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -6266,20 +6522,20 @@ ], "description": "Symfony WebProfilerBundle", "homepage": "https://symfony.com", - "time": "2018-09-30T03:38:13+00:00" + "time": "2018-09-24T08:00:32+00:00" }, { "name": "symfony/yaml", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "367e689b2fdc19965be435337b50bc8adf2746c9" + "reference": "7228a3e2163ab5623231f126cf8d7701072f9d16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/367e689b2fdc19965be435337b50bc8adf2746c9", - "reference": "367e689b2fdc19965be435337b50bc8adf2746c9", + "url": "https://api.github.com/repos/symfony/yaml/zipball/7228a3e2163ab5623231f126cf8d7701072f9d16", + "reference": "7228a3e2163ab5623231f126cf8d7701072f9d16", "shasum": "" }, "require": { @@ -6298,7 +6554,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -6325,7 +6581,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-10-02T16:36:10+00:00" + "time": "2018-10-02T16:38:08+00:00" }, { "name": "tightenco/collect", @@ -7343,16 +7599,16 @@ }, { "name": "symfony/browser-kit", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "c55fe9257003b2d95c0211b3f6941e8dfd26dffd" + "reference": "c403035e5a4e8b2919d725a511022ef1e2d3232b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/c55fe9257003b2d95c0211b3f6941e8dfd26dffd", - "reference": "c55fe9257003b2d95c0211b3f6941e8dfd26dffd", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/c403035e5a4e8b2919d725a511022ef1e2d3232b", + "reference": "c403035e5a4e8b2919d725a511022ef1e2d3232b", "shasum": "" }, "require": { @@ -7369,7 +7625,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -7396,20 +7652,20 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2018-07-26T09:10:45+00:00" + "time": "2018-09-29T21:52:52+00:00" }, { "name": "symfony/css-selector", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "d67de79a70a27d93c92c47f37ece958bf8de4d8a" + "reference": "3504dc5c848fe7362561fdeddaf24c2616577a43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/d67de79a70a27d93c92c47f37ece958bf8de4d8a", - "reference": "d67de79a70a27d93c92c47f37ece958bf8de4d8a", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/3504dc5c848fe7362561fdeddaf24c2616577a43", + "reference": "3504dc5c848fe7362561fdeddaf24c2616577a43", "shasum": "" }, "require": { @@ -7418,7 +7674,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -7449,7 +7705,7 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2018-10-02T16:36:10+00:00" + "time": "2018-10-02T16:38:08+00:00" }, { "name": "symfony/dom-crawler", @@ -7510,16 +7766,16 @@ }, { "name": "symfony/dotenv", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/dotenv.git", - "reference": "22ca63c46e252b8a8f37b8f9e6da66bff5b3d3e7" + "reference": "60dd62385303b4283023ae1e6c427a06794a01c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dotenv/zipball/22ca63c46e252b8a8f37b8f9e6da66bff5b3d3e7", - "reference": "22ca63c46e252b8a8f37b8f9e6da66bff5b3d3e7", + "url": "https://api.github.com/repos/symfony/dotenv/zipball/60dd62385303b4283023ae1e6c427a06794a01c8", + "reference": "60dd62385303b4283023ae1e6c427a06794a01c8", "shasum": "" }, "require": { @@ -7531,7 +7787,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -7563,7 +7819,7 @@ "env", "environment" ], - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-09-05T08:57:29+00:00" }, { "name": "symfony/maker-bundle", @@ -7633,16 +7889,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "2474c5d4a5e3431fee2f6f0dddde9d34983d9ceb" + "reference": "973a72e0c72156fe2bbc28b6b4a9a4b9d656f409" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/2474c5d4a5e3431fee2f6f0dddde9d34983d9ceb", - "reference": "2474c5d4a5e3431fee2f6f0dddde9d34983d9ceb", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/973a72e0c72156fe2bbc28b6b4a9a4b9d656f409", + "reference": "973a72e0c72156fe2bbc28b6b4a9a4b9d656f409", "shasum": "" }, "require": { @@ -7661,7 +7917,7 @@ "type": "symfony-bridge", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" }, "thanks": { "name": "phpunit/phpunit", @@ -7695,7 +7951,7 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2018-10-02T12:40:59+00:00" + "time": "2018-10-02T12:43:31+00:00" }, { "name": "symfony/polyfill-php70", @@ -7807,16 +8063,16 @@ }, { "name": "symfony/web-server-bundle", - "version": "v4.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/web-server-bundle.git", - "reference": "448d4437e95d0884856a1e83bc51a15b5d048060" + "reference": "ff4b16ac5f43ad70f37aa0b282db22f7ade75659" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/web-server-bundle/zipball/448d4437e95d0884856a1e83bc51a15b5d048060", - "reference": "448d4437e95d0884856a1e83bc51a15b5d048060", + "url": "https://api.github.com/repos/symfony/web-server-bundle/zipball/ff4b16ac5f43ad70f37aa0b282db22f7ade75659", + "reference": "ff4b16ac5f43ad70f37aa0b282db22f7ade75659", "shasum": "" }, "require": { @@ -7835,7 +8091,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -7862,12 +8118,30 @@ ], "description": "Symfony WebServerBundle", "homepage": "https://symfony.com", - "time": "2018-07-26T09:10:45+00:00" + "time": "2018-10-05T18:36:54+00:00" } ], "aliases": [], - "minimum-stability": "beta", - "stability-flags": [], + "minimum-stability": "dev", + "stability-flags": { + "sensiolabs/security-checker": 20, + "symfony/asset": 20, + "symfony/console": 20, + "symfony/form": 20, + "symfony/framework-bundle": 20, + "symfony/security-bundle": 20, + "symfony/serializer": 20, + "symfony/translation": 20, + "symfony/yaml": 20, + "symfony/browser-kit": 20, + "symfony/css-selector": 20, + "symfony/debug-bundle": 20, + "symfony/dotenv": 20, + "symfony/phpunit-bridge": 20, + "symfony/stopwatch": 20, + "symfony/web-profiler-bundle": 20, + "symfony/web-server-bundle": 20 + }, "prefer-stable": true, "prefer-lowest": false, "platform": { diff --git a/config/bolt/config.yaml b/config/bolt/config.yaml index 4ec951eda..e04e2ae40 100644 --- a/config/bolt/config.yaml +++ b/config/bolt/config.yaml @@ -6,8 +6,7 @@ # # If you're trying out Bolt, just keep it set to SQLite for now. database: - driver: sqlite - databasename: bolt + url: '%env(DATABASE_URL)%' # The name of the website sitename: A sample site in CONFIG diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml index 3f2dcb18e..2a4d048a6 100644 --- a/config/packages/doctrine.yaml +++ b/config/packages/doctrine.yaml @@ -9,8 +9,7 @@ doctrine: driver: 'pdo_sqlite' server_version: '3.15' charset: utf8mb4 - - url: '%env(resolve:DATABASE_URL)%' + url: '%bolt.database.url%' orm: auto_generate_proxy_classes: '%kernel.debug%' naming_strategy: doctrine.orm.naming_strategy.underscore diff --git a/src/Configuration/Config.php b/src/Configuration/Config.php index 3744b65a9..9819577a9 100644 --- a/src/Configuration/Config.php +++ b/src/Configuration/Config.php @@ -81,38 +81,6 @@ public function parseConfig() return $config; } - /** - * @return array - */ - public function getParameters(): array - { - $array = $this->data->get('general')->toArray(); - - return $this->flatten($array); - } - - /** - * @param array $array - * @param string $prefix - * - * @return array - */ - private function flatten(array $array, string $prefix = ''): array - { - $result = []; - foreach ($array as $key => $value) { - if (is_int($key)) { - $result[trim($prefix, '.')][] = $value; - } elseif (is_array($value)) { - $result = $result + $this->flatten($value, $prefix . $key . '.'); - } else { - $result[$prefix . $key] = $value; - } - } - - return $result; - } - /** * Get a config value, using a path. * diff --git a/src/Kernel.php b/src/Kernel.php index 7c373c3e2..6cad3affb 100644 --- a/src/Kernel.php +++ b/src/Kernel.php @@ -4,13 +4,14 @@ namespace Bolt; -use Bolt\Configuration\Config; use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait; +use Symfony\Component\Config\FileLocator; use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\Config\Resource\FileResource; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Kernel as BaseKernel; use Symfony\Component\Routing\RouteCollectionBuilder; +use Symfony\Component\Yaml\Yaml; class Kernel extends BaseKernel { @@ -44,11 +45,17 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa $container->setParameter('container.dumper.inline_class_loader', true); $confDir = $this->getProjectDir() . '/config'; - $config = new Config(); - foreach ($config->getParameters() as $key => $value) { + $fileLocator = new FileLocator([ $confDir . '/bolt' ]); + $fileName = $fileLocator->locate('config.yaml', null, true); + + $yaml = Yaml::parseFile($fileName); + unset($yaml['__nodes']); + + $container->set('bolt.config.general', $yaml); + + foreach ($this->flattenKeys($yaml) as $key => $value) { $container->setParameter('bolt.' . $key, $value); } - $container->set('config', $config); $loader->load($confDir . '/{packages}/*' . self::CONFIG_EXTS, 'glob'); $loader->load($confDir . '/{packages}/' . $this->environment . '/**/*' . self::CONFIG_EXTS, 'glob'); @@ -64,4 +71,26 @@ protected function configureRoutes(RouteCollectionBuilder $routes) $routes->import($confDir . '/{routes}/' . $this->environment . '/**/*' . self::CONFIG_EXTS, '/', 'glob'); $routes->import($confDir . '/{routes}' . self::CONFIG_EXTS, '/', 'glob'); } + + /** + * @param array $array + * @param string $prefix + * + * @return array + */ + private function flattenKeys(array $array, string $prefix = ''): array + { + $result = []; + foreach ($array as $key => $value) { + if (is_int($key)) { + $result[trim($prefix, '.')][] = $value; + } elseif(is_array($value)) { + $result = $result + $this->flattenKeys($value, $prefix . $key . '.'); + } else { + $result[$prefix . $key] = $value; + } + } + + return $result; + } } diff --git a/symfony.lock b/symfony.lock index bc27c5646..2c81a5d47 100644 --- a/symfony.lock +++ b/symfony.lock @@ -287,6 +287,9 @@ "ref": "5ec5bb098bc693cd92f03390dd488ea0847cfcc7" } }, + "symfony/contracts": { + "version": "1.0-dev" + }, "symfony/css-selector": { "version": "v3.4.0-beta2" }, @@ -434,9 +437,6 @@ "ref": "5b2f0ee78c90d671860ac6450e37dec10fbc0719" } }, - "symfony/security": { - "version": "v3.4.0-beta2" - }, "symfony/security-bundle": { "version": "3.3", "recipe": { @@ -446,6 +446,18 @@ "ref": "85834af1496735f28d831489d12ab1921a875e0d" } }, + "symfony/security-core": { + "version": "4.2-dev" + }, + "symfony/security-csrf": { + "version": "4.2-dev" + }, + "symfony/security-guard": { + "version": "4.2-dev" + }, + "symfony/security-http": { + "version": "4.2-dev" + }, "symfony/serializer": { "version": "v4.1.4" },