From aedeebb4f1c5108f40a8551f3eb7e02a92807c6a Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Sat, 16 Jan 2016 18:29:47 +0100 Subject: [PATCH] fix merge 2.3 into 2.7 for SecureRandom dependency --- src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +- src/Symfony/Bundle/SecurityBundle/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 045d19c354..bcfce7b707 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -26,7 +26,7 @@ "symfony/http-kernel": "~2.7", "symfony/filesystem": "~2.3", "symfony/routing": "~2.6,>2.6.4", - "symfony/security-core": "~2.6", + "symfony/security-core": "~2.6.13|~2.7.9|~2.8", "symfony/security-csrf": "~2.6", "symfony/stopwatch": "~2.3", "symfony/templating": "~2.1", diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json index e702a90990..f00e09ca3c 100644 --- a/src/Symfony/Bundle/SecurityBundle/composer.json +++ b/src/Symfony/Bundle/SecurityBundle/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.9", - "symfony/security": "~2.7.9|~2.8", + "symfony/security": "~2.7", "symfony/security-acl": "~2.7", "symfony/http-kernel": "~2.2" },