diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2014-12-27 12:38:42 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2014-12-27 12:44:51 +0100 |
| commit | a600e5d951c969875af2810d208589dec3a1969e (patch) | |
| tree | 939f68c75b5b6c5d71f12cb1e1ed5fb404676384 | |
| parent | 745d367adbcaaa5d4a04d28311640b881546c05a (diff) | |
| download | symfony-security-a600e5d951c969875af2810d208589dec3a1969e.zip symfony-security-a600e5d951c969875af2810d208589dec3a1969e.tar.gz symfony-security-a600e5d951c969875af2810d208589dec3a1969e.tar.bz2 | |
[2.7] Allow 3.0 requirements
| -rw-r--r-- | Acl/composer.json | 2 | ||||
| -rw-r--r-- | Core/composer.json | 10 | ||||
| -rw-r--r-- | Csrf/composer.json | 4 | ||||
| -rw-r--r-- | Http/composer.json | 12 | ||||
| -rw-r--r-- | composer.json | 16 |
5 files changed, 22 insertions, 22 deletions
diff --git a/Acl/composer.json b/Acl/composer.json index 8f65f50..9eadd66 100644 --- a/Acl/composer.json +++ b/Acl/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/security-core": "~2.4" + "symfony/security-core": "~2.4|~3.0.0" }, "require-dev": { "doctrine/common": "~2.2", diff --git a/Core/composer.json b/Core/composer.json index 2fc50f4..56240d8 100644 --- a/Core/composer.json +++ b/Core/composer.json @@ -19,11 +19,11 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/event-dispatcher": "~2.1", - "symfony/expression-language": "~2.6", - "symfony/http-foundation": "~2.4", - "symfony/translation": "~2.0,>=2.0.5", - "symfony/validator": "~2.5,>=2.5.5", + "symfony/event-dispatcher": "~2.1|~3.0.0", + "symfony/expression-language": "~2.6|~3.0.0", + "symfony/http-foundation": "~2.4|~3.0.0", + "symfony/translation": "~2.0,>=2.0.5|~3.0.0", + "symfony/validator": "~2.5,>=2.5.5|~3.0.0", "psr/log": "~1.0", "ircmaxell/password-compat": "1.0.*" }, diff --git a/Csrf/composer.json b/Csrf/composer.json index 0ed6428..afabb81 100644 --- a/Csrf/composer.json +++ b/Csrf/composer.json @@ -17,10 +17,10 @@ ], "require": { "php": ">=5.3.3", - "symfony/security-core": "~2.4" + "symfony/security-core": "~2.4|~3.0.0" }, "require-dev": { - "symfony/http-foundation": "~2.1" + "symfony/http-foundation": "~2.1|~3.0.0" }, "suggest": { "symfony/http-foundation": "For using the class SessionTokenStorage." diff --git a/Http/composer.json b/Http/composer.json index 58f443d..b75e1d6 100644 --- a/Http/composer.json +++ b/Http/composer.json @@ -17,14 +17,14 @@ ], "require": { "php": ">=5.3.3", - "symfony/security-core": "~2.6", - "symfony/event-dispatcher": "~2.1", - "symfony/http-foundation": "~2.4", - "symfony/http-kernel": "~2.4" + "symfony/security-core": "~2.6|~3.0.0", + "symfony/event-dispatcher": "~2.1|~3.0.0", + "symfony/http-foundation": "~2.4|~3.0.0", + "symfony/http-kernel": "~2.4|~3.0.0" }, "require-dev": { - "symfony/routing": "~2.2", - "symfony/security-csrf": "~2.4", + "symfony/routing": "~2.2|~3.0.0", + "symfony/security-csrf": "~2.4|~3.0.0", "psr/log": "~1.0" }, "suggest": { diff --git a/composer.json b/composer.json index f1abdb3..fac11c4 100644 --- a/composer.json +++ b/composer.json @@ -17,9 +17,9 @@ ], "require": { "php": ">=5.3.3", - "symfony/event-dispatcher": "~2.2", - "symfony/http-foundation": "~2.1", - "symfony/http-kernel": "~2.4" + "symfony/event-dispatcher": "~2.2|~3.0.0", + "symfony/http-foundation": "~2.1|~3.0.0", + "symfony/http-kernel": "~2.4|~3.0.0" }, "replace": { "symfony/security-acl": "self.version", @@ -28,15 +28,15 @@ "symfony/security-http": "self.version" }, "require-dev": { - "symfony/locale": "~2.0,>=2.0.5", - "symfony/routing": "~2.2", - "symfony/translation": "~2.0,>=2.0.5", - "symfony/validator": "~2.5,>=2.5.5", + "symfony/locale": "~2.0,>=2.0.5|~3.0.0", + "symfony/routing": "~2.2|~3.0.0", + "symfony/translation": "~2.0,>=2.0.5|~3.0.0", + "symfony/validator": "~2.5,>=2.5.5|~3.0.0", "doctrine/common": "~2.2", "doctrine/dbal": "~2.2", "psr/log": "~1.0", "ircmaxell/password-compat": "~1.0", - "symfony/expression-language": "~2.6" + "symfony/expression-language": "~2.6|~3.0.0" }, "suggest": { "symfony/class-loader": "For using the ACL generateSql script", |