diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-30 09:56:10 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-30 09:56:10 +0100 |
| commit | a993ce03b16802e357281858bcdae7d1f1edf137 (patch) | |
| tree | ab6dcf0fa0523d98d86f89fd7f0a8b5b52e76b9f | |
| parent | e0355045aadb4ca821b86a54c3709502f528883d (diff) | |
| parent | a600e5d951c969875af2810d208589dec3a1969e (diff) | |
| download | symfony-security-a993ce03b16802e357281858bcdae7d1f1edf137.zip symfony-security-a993ce03b16802e357281858bcdae7d1f1edf137.tar.gz symfony-security-a993ce03b16802e357281858bcdae7d1f1edf137.tar.bz2 | |
minor #13135 [2.7] Allow 3.0 requirements (nicolas-grekas)
This PR was merged into the 2.7 branch.
Discussion
----------
[2.7] Allow 3.0 requirements
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | lets see
| Fixed tickets | -
| License | MIT
| Doc PR | -
2.7 is going to provide almost the same interfaces as 3.0 but also a BC layer for previous releases.
This means that 2.7 is going to be mostly compatible with 3.0.
Lets continuously test this assumption and see when and were we break compat with 2.7 (and try to avoid it as much as possible to smoothen the transition to 3.0).
Commits
-------
b369bb6 [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", |